From a9879cd74b3e89806f5bf38e57c8e113f698d6c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Gjesse?= <sgjesse@google.com>
Date: Mon, 6 Sep 2021 13:18:20 +0200
Subject: Update D8 and R8 to 3.2.2-dev

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

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

Test: TARGET_PRODUCT=aosp_arm64 m -j core-oj
Change-Id: I3b9bd362ad7f534c7ba51e72894066cbc792ad10
---
 r8.jar     |   Bin 12663209 -> 12669529 bytes
 r8.jar.map | 23276 ++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 11774 insertions(+), 11502 deletions(-)

diff --git a/r8.jar b/r8.jar
index 4b39374..bdd0c96 100644
Binary files a/r8.jar and b/r8.jar differ
diff --git a/r8.jar.map b/r8.jar.map
index b53486a..4ea170e 100644
--- a/r8.jar.map
+++ b/r8.jar.map
@@ -1,7 +1,7 @@
 # compiler: R8
-# compiler_version: 3.1.19-dev
+# compiler_version: 3.2.2-dev
 # compiler_hash: engineering
-# pg_map_id: 7b6893d
+# pg_map_id: 416d343
 # common_typos_disable
 # {"id":"com.android.tools.r8.mapping","version":"1.0"}
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.internal.ez0:
@@ -537,10 +537,10 @@ com.android.tools.r8.D8 -> com.android.tools.r8.D8:
     86:87:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):262:263 -> d
     88:91:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.RecordRewritingNamingLens.createRecordRewritingNamingLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):30:33 -> d
     88:91:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):263 -> d
-    92:92:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> d
+    92:92:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> d
     92:92:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):265 -> d
     93:95:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):267:269 -> d
-    96:96:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():488:488 -> d
+    96:96:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():494:494 -> d
     96:96:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):270 -> d
     97:118:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):270:291 -> d
     119:131:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):285:297 -> d
@@ -585,7 +585,7 @@ com.android.tools.r8.D8Command -> com.android.tools.r8.D8Command:
     28:38:void <init>(boolean,boolean):431:441 -> <init>
     1:1:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):348:348 -> a
     1:4:com.android.tools.r8.utils.InternalOptions getInternalOptions():446:449 -> b
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> b
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> b
     5:5:com.android.tools.r8.utils.InternalOptions getInternalOptions():450 -> b
     6:14:com.android.tools.r8.utils.InternalOptions getInternalOptions():451:459 -> b
     15:74:com.android.tools.r8.utils.InternalOptions getInternalOptions():458:517 -> b
@@ -727,7 +727,7 @@ com.android.tools.r8.DataEntryResource -> com.android.tools.r8.DataEntryResource
     1:1:com.android.tools.r8.DataEntryResource fromZip(java.util.zip.ZipFile,java.util.zip.ZipEntry):44:44 -> fromZip
     1:1:com.android.tools.r8.DataEntryResource withName(java.lang.String):48:48 -> withName
 com.android.tools.r8.DataEntryResource$1 -> com.android.tools.r8.v:
-com.android.tools.r8.DataEntryResource$ByteDataEntryResource -> com.android.tools.r8.internal.TJ0:
+com.android.tools.r8.DataEntryResource$ByteDataEntryResource -> com.android.tools.r8.internal.WJ0:
     byte[] bytes -> a
     com.android.tools.r8.origin.Origin origin -> c
     java.lang.String name -> b
@@ -745,7 +745,7 @@ com.android.tools.r8.DataEntryResource$LocalDataEntryResource -> com.android.too
     1:3:java.io.InputStream getByteStream():134:136 -> getByteStream
     1:1:java.lang.String getName():128:128 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():123:123 -> getOrigin
-com.android.tools.r8.DataEntryResource$NestedDataEntryResource -> com.android.tools.r8.internal.UJ0:
+com.android.tools.r8.DataEntryResource$NestedDataEntryResource -> com.android.tools.r8.internal.XJ0:
     com.android.tools.r8.DataEntryResource resource -> b
     java.lang.String name -> a
     1:4:void <init>(java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.DataEntryResource):150:153 -> <init>
@@ -1108,7 +1108,7 @@ com.android.tools.r8.ExtractMarker -> com.android.tools.r8.ExtractMarker:
     25:78:void main(java.lang.String[]):112:165 -> main
     79:81:void main(java.lang.String[]):129:129 -> main
     120:124:void main(java.lang.String[]):168:172 -> main
-com.android.tools.r8.ExtractMarker$VdexOrigin -> com.android.tools.r8.internal.yO0:
+com.android.tools.r8.ExtractMarker$VdexOrigin -> com.android.tools.r8.internal.BO0:
     int index -> e
     1:2:void <init>(com.android.tools.r8.origin.Origin,int):35:36 -> <init>
     1:1:java.lang.String part():41:41 -> part
@@ -1181,138 +1181,138 @@ com.android.tools.r8.GenerateLintFiles -> com.android.tools.r8.L:
     boolean $assertionsDisabled -> h
     com.android.tools.r8.utils.Reporter reporter -> b
     com.android.tools.r8.graph.DexItemFactory factory -> a
-    1:1:void <clinit>():69:69 -> <clinit>
-    1:1:void <init>(java.lang.String,java.lang.String,java.lang.String):85:85 -> <init>
-    2:28:void <init>(java.lang.String,java.lang.String,java.lang.String):73:99 -> <init>
-    29:41:void <init>(java.lang.String,java.lang.String,java.lang.String):96:108 -> <init>
-    42:48:void <init>(java.lang.String,java.lang.String,java.lang.String):107:113 -> <init>
-    49:51:void <init>(java.lang.String,java.lang.String,java.lang.String):112:114 -> <init>
-    52:52:void <init>(java.lang.String,java.lang.String,java.lang.String):91:91 -> <init>
-    1:3:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration readDesugaredLibraryConfiguration(java.lang.String):125:127 -> a
-    4:14:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):143:153 -> a
-    15:22:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode(com.android.tools.r8.graph.DexMethod):131:138 -> a
-    15:22:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):153 -> a
-    23:39:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):155:171 -> a
-    40:73:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):169:202 -> a
-    74:74:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):223:223 -> a
-    75:76:java.nio.file.Path getAndroidJarPath(com.android.tools.r8.utils.AndroidApiLevel):119:120 -> a
-    75:76:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):223 -> a
-    77:95:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):223:241 -> a
-    96:96:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DirectMappedDexApplication.programDefinitionFor(com.android.tools.r8.graph.DexType):80:80 -> a
-    96:96:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):241 -> a
-    97:97:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):246:246 -> a
-    98:98:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():485:485 -> a
-    98:98:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):247 -> a
-    99:108:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):251:260 -> a
-    109:162:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):243:296 -> a
-    163:163:java.util.List lambda$collectSupportedMethods$0(com.android.tools.r8.graph.DexClass):254:254 -> a
-    164:166:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):307:309 -> a
-    167:167:java.lang.String lintBaseFileName(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):301:301 -> a
-    167:167:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):312 -> a
-    168:168:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):312:312 -> a
-    169:169:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):309:309 -> a
-    170:199:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):322:351 -> a
-    200:216:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):350:366 -> a
-    217:229:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):327:339 -> a
-    230:230:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():118:118 -> a
-    230:230:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):339 -> a
-    231:231:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):339:339 -> a
-    232:242:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):335:345 -> a
-    243:256:void generateLintFiles(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate,java.util.function.BiPredicate):374:387 -> a
-    257:257:boolean lambda$generateLintFiles$4(java.util.function.BiPredicate,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):384:384 -> a
-    258:258:void run(int):402:402 -> a
-    259:259:void run(int):401:401 -> a
-    260:260:boolean lambda$run$5(com.android.tools.r8.utils.AndroidApiLevel):403:403 -> a
-    261:266:boolean lambda$run$6(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):405:410 -> a
-    267:267:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.addField(com.android.tools.r8.graph.DexEncodedField):466:466 -> a
-    267:267:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$300(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):444 -> a
-    267:267:void lambda$generateClassHTML$8(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):757 -> a
-    268:282:void generateClassHTML(java.io.PrintStream,com.android.tools.r8.graph.DexClass,boolean,java.util.function.Predicate,java.util.function.Predicate):752:766 -> a
-    283:283:boolean lambda$generateClassHTML$7(com.android.tools.r8.graph.DexEncodedField):755:755 -> a
-    284:285:boolean lambda$generateClassHTML$9(com.android.tools.r8.graph.DexEncodedMethod):762:763 -> a
-    286:286:void lambda$generateClassHTML$10(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):765:765 -> a
-    287:287:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$200(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):444:444 -> a
-    287:287:void lambda$generateClassHTML$10(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):765 -> a
-    288:292:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.addMethod(com.android.tools.r8.graph.DexEncodedMethod):471:475 -> a
-    288:292:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$200(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):444 -> a
-    288:292:void lambda$generateClassHTML$10(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):765 -> a
-    293:304:void generateDesugaredLibraryApisDocumetation():770:781 -> a
-    305:305:void lambda$generateDesugaredLibraryApisDocumetation$15(java.io.PrintStream,com.android.tools.r8.graph.DexClass):775:775 -> a
-    306:306:boolean lambda$generateDesugaredLibraryApisDocumetation$16(com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass):779:779 -> a
-    307:307:void lambda$generateDesugaredLibraryApisDocumetation$20(java.io.PrintStream,com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass):783:783 -> a
-    308:308:boolean lambda$generateDesugaredLibraryApisDocumetation$19(com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):788:788 -> a
-    309:310:void main(java.lang.String[]):792:793 -> a
-    311:315:void run():392:396 -> a
-    311:315:void main(java.lang.String[]):793 -> a
-    316:321:void main(java.lang.String[]):796:801 -> a
+    1:1:void <clinit>():68:68 -> <clinit>
+    1:1:void <init>(java.lang.String,java.lang.String,java.lang.String):84:84 -> <init>
+    2:28:void <init>(java.lang.String,java.lang.String,java.lang.String):72:98 -> <init>
+    29:41:void <init>(java.lang.String,java.lang.String,java.lang.String):95:107 -> <init>
+    42:48:void <init>(java.lang.String,java.lang.String,java.lang.String):106:112 -> <init>
+    49:51:void <init>(java.lang.String,java.lang.String,java.lang.String):111:113 -> <init>
+    52:52:void <init>(java.lang.String,java.lang.String,java.lang.String):90:90 -> <init>
+    1:3:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration readDesugaredLibraryConfiguration(java.lang.String):124:126 -> a
+    4:14:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):142:152 -> a
+    15:22:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode(com.android.tools.r8.graph.DexMethod):130:137 -> a
+    15:22:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):152 -> a
+    23:33:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):155:165 -> a
+    34:67:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):163:196 -> a
+    68:68:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):217:217 -> a
+    69:70:java.nio.file.Path getAndroidJarPath(com.android.tools.r8.utils.AndroidApiLevel):118:119 -> a
+    69:70:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):217 -> a
+    71:89:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):217:235 -> a
+    90:90:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DirectMappedDexApplication.programDefinitionFor(com.android.tools.r8.graph.DexType):80:80 -> a
+    90:90:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):235 -> a
+    91:91:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):240:240 -> a
+    92:92:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():427:427 -> a
+    92:92:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):241 -> a
+    93:102:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):245:254 -> a
+    103:156:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):237:290 -> a
+    157:157:java.util.List lambda$collectSupportedMethods$0(com.android.tools.r8.graph.DexClass):248:248 -> a
+    158:160:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):301:303 -> a
+    161:161:java.lang.String lintBaseFileName(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):295:295 -> a
+    161:161:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):306 -> a
+    162:162:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):306:306 -> a
+    163:163:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):303:303 -> a
+    164:193:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):316:345 -> a
+    194:210:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):344:360 -> a
+    211:223:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):321:333 -> a
+    224:224:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():118:118 -> a
+    224:224:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):333 -> a
+    225:225:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):333:333 -> a
+    226:236:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):329:339 -> a
+    237:250:void generateLintFiles(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate,java.util.function.BiPredicate):368:381 -> a
+    251:251:boolean lambda$generateLintFiles$4(java.util.function.BiPredicate,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):378:378 -> a
+    252:252:void run(int):396:396 -> a
+    253:253:void run(int):395:395 -> a
+    254:254:boolean lambda$run$5(com.android.tools.r8.utils.AndroidApiLevel):397:397 -> a
+    255:260:boolean lambda$run$6(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):399:404 -> a
+    261:261:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.addField(com.android.tools.r8.graph.DexEncodedField):460:460 -> a
+    261:261:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$300(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):438 -> a
+    261:261:void lambda$generateClassHTML$8(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):751 -> a
+    262:276:void generateClassHTML(java.io.PrintStream,com.android.tools.r8.graph.DexClass,boolean,java.util.function.Predicate,java.util.function.Predicate):746:760 -> a
+    277:277:boolean lambda$generateClassHTML$7(com.android.tools.r8.graph.DexEncodedField):749:749 -> a
+    278:279:boolean lambda$generateClassHTML$9(com.android.tools.r8.graph.DexEncodedMethod):756:757 -> a
+    280:280:void lambda$generateClassHTML$10(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):759:759 -> a
+    281:281:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$200(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):438:438 -> a
+    281:281:void lambda$generateClassHTML$10(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):759 -> a
+    282:286:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.addMethod(com.android.tools.r8.graph.DexEncodedMethod):465:469 -> a
+    282:286:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$200(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):438 -> a
+    282:286:void lambda$generateClassHTML$10(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):759 -> a
+    287:298:void generateDesugaredLibraryApisDocumetation():764:775 -> a
+    299:299:void lambda$generateDesugaredLibraryApisDocumetation$15(java.io.PrintStream,com.android.tools.r8.graph.DexClass):769:769 -> a
+    300:300:boolean lambda$generateDesugaredLibraryApisDocumetation$16(com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass):773:773 -> a
+    301:301:void lambda$generateDesugaredLibraryApisDocumetation$20(java.io.PrintStream,com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass):777:777 -> a
+    302:302:boolean lambda$generateDesugaredLibraryApisDocumetation$19(com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):782:782 -> a
+    303:304:void main(java.lang.String[]):786:787 -> a
+    305:309:void run():386:390 -> a
+    305:309:void main(java.lang.String[]):787 -> a
+    310:315:void main(java.lang.String[]):790:795 -> a
     boolean lambda$generateDesugaredLibraryApisDocumetation$11(com.android.tools.r8.graph.DexEncodedMethod) -> b
     boolean lambda$generateDesugaredLibraryApisDocumetation$13(com.android.tools.r8.graph.DexEncodedField) -> b
-    1:1:java.util.List lambda$collectSupportedMethods$1(com.android.tools.r8.graph.DexClass):276:276 -> b
+    1:1:java.util.List lambda$collectSupportedMethods$1(com.android.tools.r8.graph.DexClass):270:270 -> b
     boolean lambda$generateDesugaredLibraryApisDocumetation$14(com.android.tools.r8.graph.DexEncodedMethod) -> c
     boolean lambda$generateDesugaredLibraryApisDocumetation$18(com.android.tools.r8.graph.DexEncodedField) -> c
-    1:1:java.util.List lambda$collectSupportedMethods$2(com.android.tools.r8.graph.DexClass):290:290 -> c
-    1:1:java.lang.String lambda$generateDesugaredLibraryApisDocumetation$12(com.android.tools.r8.graph.DexClass):774:774 -> d
-    1:1:java.lang.String lambda$generateDesugaredLibraryApisDocumetation$17(com.android.tools.r8.graph.DexClass):780:780 -> e
+    1:1:java.util.List lambda$collectSupportedMethods$2(com.android.tools.r8.graph.DexClass):284:284 -> c
+    1:1:java.lang.String lambda$generateDesugaredLibraryApisDocumetation$12(com.android.tools.r8.graph.DexClass):768:768 -> d
+    1:1:java.lang.String lambda$generateDesugaredLibraryApisDocumetation$17(com.android.tools.r8.graph.DexClass):774:774 -> e
 com.android.tools.r8.GenerateLintFiles$1 -> com.android.tools.r8.H:
 com.android.tools.r8.GenerateLintFiles$HTMLBuilder -> com.android.tools.r8.I:
     java.lang.StringBuilder com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.builder -> b
     java.lang.String com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.NL -> a
     java.lang.String com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.indent -> c
     java.lang.String indent -> d
-    1:1:void com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.<init>():419:419 -> <init>
-    1:1:void <init>():621 -> <init>
-    2:4:void com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.<init>():415:417 -> <init>
-    2:4:void <init>():621 -> <init>
-    5:5:void <init>():622:622 -> <init>
-    6:6:void <init>(com.android.tools.r8.GenerateLintFiles$1):621:621 -> <init>
-    1:1:com.android.tools.r8.GenerateLintFiles$HTMLBuilder appendLiCode(java.lang.String):645:645 -> a
-    1:3:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):427:429 -> b
+    1:1:void com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.<init>():413:413 -> <init>
+    1:1:void <init>():615 -> <init>
+    2:4:void com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.<init>():409:411 -> <init>
+    2:4:void <init>():615 -> <init>
+    5:5:void <init>():616:616 -> <init>
+    6:6:void <init>(com.android.tools.r8.GenerateLintFiles$1):615:615 -> <init>
+    1:1:com.android.tools.r8.GenerateLintFiles$HTMLBuilder appendLiCode(java.lang.String):639:639 -> a
+    1:3:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):421:423 -> b
     1:3:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
-    1:1:void decreaseIndent():630:630 -> c
-    1:1:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):656 -> c
-    2:2:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.indent(java.lang.String):422:422 -> c
-    2:2:void decreaseIndent():631 -> c
-    2:2:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):656 -> c
-    3:3:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):657:657 -> c
-    1:1:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):650:650 -> d
-    2:2:void increaseIndent():625:625 -> d
-    2:2:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):651 -> d
-    3:3:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.indent(java.lang.String):422:422 -> d
-    3:3:void increaseIndent():626 -> d
-    3:3:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):651 -> d
-    1:1:java.lang.String com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.toString():440:440 -> toString
+    1:1:void decreaseIndent():624:624 -> c
+    1:1:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):650 -> c
+    2:2:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.indent(java.lang.String):416:416 -> c
+    2:2:void decreaseIndent():625 -> c
+    2:2:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):650 -> c
+    3:3:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):651:651 -> c
+    1:1:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):644:644 -> d
+    2:2:void increaseIndent():619:619 -> d
+    2:2:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645 -> d
+    3:3:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.indent(java.lang.String):416:416 -> d
+    3:3:void increaseIndent():620 -> d
+    3:3:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645 -> d
+    1:1:java.lang.String com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.toString():434:434 -> toString
     1:1:java.lang.String com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.toString():0 -> toString
       # {"id":"com.android.tools.r8.synthesized"}
 com.android.tools.r8.GenerateLintFiles$HTMLSourceBuilder -> com.android.tools.r8.J:
     java.util.Set parallelMethods -> h
     boolean $assertionsDisabled -> i
-    1:1:void <clinit>():662:662 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexClass,boolean,java.util.Set):666:667 -> <init>
-    1:28:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):590:617 -> a
-    1:28:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):662 -> a
-    1:4:java.lang.String toString():677:680 -> toString
-    5:5:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):635:635 -> toString
-    5:5:java.lang.String toString():680 -> toString
-    6:6:java.lang.String toString():682:682 -> toString
-    7:7:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):635:635 -> toString
-    7:7:java.lang.String toString():682 -> toString
-    8:12:java.lang.String toString():683:687 -> toString
-    13:22:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.accessFlags(com.android.tools.r8.graph.FieldAccessFlags):537:546 -> toString
-    13:22:java.lang.String toString():688 -> toString
-    23:28:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.accessFlags(com.android.tools.r8.graph.FieldAccessFlags):545:550 -> toString
-    23:28:java.lang.String toString():688 -> toString
-    29:38:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.accessFlags(com.android.tools.r8.graph.FieldAccessFlags):549:558 -> toString
-    29:38:java.lang.String toString():688 -> toString
-    39:43:java.lang.String toString():688:692 -> toString
-    44:58:java.lang.String toString():687:701 -> toString
-    59:75:java.lang.String toString():697:713 -> toString
-    76:109:java.lang.String toString():707:740 -> toString
-    110:110:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):640:640 -> toString
-    110:110:java.lang.String toString():740 -> toString
-    111:111:java.lang.String toString():741:741 -> toString
-    112:112:java.lang.String com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.toString():440:440 -> toString
-    112:112:java.lang.String toString():742 -> toString
+    1:1:void <clinit>():656:656 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexClass,boolean,java.util.Set):660:661 -> <init>
+    1:28:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):584:611 -> a
+    1:28:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):656 -> a
+    1:4:java.lang.String toString():671:674 -> toString
+    5:5:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
+    5:5:java.lang.String toString():674 -> toString
+    6:6:java.lang.String toString():676:676 -> toString
+    7:7:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
+    7:7:java.lang.String toString():676 -> toString
+    8:12:java.lang.String toString():677:681 -> toString
+    13:22:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.accessFlags(com.android.tools.r8.graph.FieldAccessFlags):531:540 -> toString
+    13:22:java.lang.String toString():682 -> toString
+    23:28:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.accessFlags(com.android.tools.r8.graph.FieldAccessFlags):539:544 -> toString
+    23:28:java.lang.String toString():682 -> toString
+    29:38:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.accessFlags(com.android.tools.r8.graph.FieldAccessFlags):543:552 -> toString
+    29:38:java.lang.String toString():682 -> toString
+    39:43:java.lang.String toString():682:686 -> toString
+    44:58:java.lang.String toString():681:695 -> toString
+    59:75:java.lang.String toString():691:707 -> toString
+    76:109:java.lang.String toString():701:734 -> toString
+    110:110:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):634:634 -> toString
+    110:110:java.lang.String toString():734 -> toString
+    111:111:java.lang.String toString():735:735 -> toString
+    112:112:java.lang.String com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.toString():434:434 -> toString
+    112:112:java.lang.String toString():736 -> toString
 com.android.tools.r8.GenerateLintFiles$SourceBuilder -> com.android.tools.r8.K:
     java.util.List fields -> b
     java.lang.String packageName -> f
@@ -1321,20 +1321,20 @@ com.android.tools.r8.GenerateLintFiles$SourceBuilder -> com.android.tools.r8.K:
     boolean $assertionsDisabled -> g
     boolean newClass -> a
     java.lang.String className -> e
-    1:1:void <clinit>():444:444 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexClass,boolean,com.android.tools.r8.GenerateLintFiles$1):444:444 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexClass,boolean):455:455 -> <init>
-    3:15:void <init>(com.android.tools.r8.graph.DexClass,boolean):448:460 -> <init>
-    1:5:java.lang.String typeInPackage(java.lang.String,java.lang.String):481:485 -> a
-    6:13:java.lang.String typeInPackage(java.lang.String):491:498 -> a
-    14:17:java.lang.String typeInPackage(com.android.tools.r8.graph.DexType):502:505 -> a
-    18:27:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):562:571 -> a
-    28:33:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):570:575 -> a
-    34:46:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):574:586 -> a
-com.android.tools.r8.GenerateLintFiles$SupportedMethods -> com.android.tools.r8.internal.zQ0:
+    1:1:void <clinit>():438:438 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexClass,boolean,com.android.tools.r8.GenerateLintFiles$1):438:438 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexClass,boolean):449:449 -> <init>
+    3:15:void <init>(com.android.tools.r8.graph.DexClass,boolean):442:454 -> <init>
+    1:5:java.lang.String typeInPackage(java.lang.String,java.lang.String):475:479 -> a
+    6:13:java.lang.String typeInPackage(java.lang.String):485:492 -> a
+    14:17:java.lang.String typeInPackage(com.android.tools.r8.graph.DexType):496:499 -> a
+    18:27:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):556:565 -> a
+    28:33:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):564:569 -> a
+    34:46:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):568:580 -> a
+com.android.tools.r8.GenerateLintFiles$SupportedMethods -> com.android.tools.r8.internal.CQ0:
     java.util.Map supportedMethods -> b
     java.util.Set classesWithAllMethodsSupported -> a
-    1:3:void <init>(java.util.Set,java.util.Map):211:213 -> <init>
+    1:3:void <init>(java.util.Set,java.util.Map):205:207 -> <init>
 com.android.tools.r8.GenerateMainDexList -> com.android.tools.r8.GenerateMainDexList:
     com.android.tools.r8.utils.Timing timing -> a
     com.android.tools.r8.utils.InternalOptions options -> b
@@ -1446,7 +1446,7 @@ com.android.tools.r8.L8 -> com.android.tools.r8.L8:
     32:38:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):99:105 -> a
     39:54:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):127:142 -> a
     39:54:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
-    55:55:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):322:322 -> a
+    55:55:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):316:316 -> a
     55:55:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):142 -> a
     55:55:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
     56:60:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):142:146 -> a
@@ -1465,7 +1465,7 @@ com.android.tools.r8.L8 -> com.android.tools.r8.L8:
     67:67:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
     68:71:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):147:150 -> a
     68:71:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
-    72:72:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():488:488 -> a
+    72:72:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():494:494 -> a
     72:72:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):151 -> a
     72:72:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
     73:81:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):151:159 -> a
@@ -1644,10 +1644,10 @@ com.android.tools.r8.R8 -> com.android.tools.r8.R8:
     com.android.tools.r8.graph.DexApplication lambda$run$7(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexApplication) -> a
     1:1:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):214:214 -> a
     2:9:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):227:234 -> a
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     10:10:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):235 -> a
     11:11:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):236:236 -> a
-    12:12:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():488:488 -> a
+    12:12:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():494:494 -> a
     12:12:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):237 -> a
     13:26:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):237:250 -> a
     27:28:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):256:257 -> a
@@ -1788,7 +1788,7 @@ com.android.tools.r8.R8Command -> com.android.tools.r8.R8Command:
     74:84:com.android.tools.r8.utils.InternalOptions getInternalOptions():894:904 -> b
     85:95:com.android.tools.r8.utils.InternalOptions getInternalOptions():901:911 -> b
     96:120:com.android.tools.r8.utils.InternalOptions getInternalOptions():908:932 -> b
-    121:121:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> b
+    121:121:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> b
     121:121:com.android.tools.r8.utils.InternalOptions getInternalOptions():937 -> b
     122:143:com.android.tools.r8.utils.InternalOptions getInternalOptions():938:959 -> b
     144:155:com.android.tools.r8.DumpOptions dumpOptions():991:1002 -> b
@@ -1872,7 +1872,7 @@ com.android.tools.r8.R8Command$Builder -> com.android.tools.r8.R8Command$Builder
     1:4:com.android.tools.r8.R8Command makeCommand():467:470 -> q
     5:5:com.android.tools.r8.R8Command makeCommand():468:468 -> q
     1:16:com.android.tools.r8.R8Command makeR8Command():474:489 -> r
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.shouldEnableKeepRuleSynthesisForRecompilation():751:751 -> r
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.shouldEnableKeepRuleSynthesisForRecompilation():757:757 -> r
     17:17:com.android.tools.r8.R8Command makeR8Command():489 -> r
     18:79:com.android.tools.r8.R8Command makeR8Command():490:551 -> r
     80:80:com.android.tools.r8.utils.InternalOptions$DesugarState com.android.tools.r8.BaseCompilerCommand$Builder.getDesugaringState():516:516 -> r
@@ -2132,14 +2132,14 @@ com.android.tools.r8.StringConsumer$WriterConsumer -> com.android.tools.r8.f0:
     1:3:void <init>(com.android.tools.r8.origin.Origin,java.io.Writer,com.android.tools.r8.StringConsumer):191:193 -> <init>
     1:5:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):198:202 -> accept
     1:5:void finished(com.android.tools.r8.DiagnosticsHandler):208:212 -> finished
-com.android.tools.r8.StringResource -> com.android.tools.r8.internal.ap1:
+com.android.tools.r8.StringResource -> com.android.tools.r8.internal.So1:
     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 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.internal.Xo1:
-com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.internal.Yo1:
+com.android.tools.r8.StringResource$1 -> com.android.tools.r8.internal.Po1:
+com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.internal.Qo1:
     java.nio.charset.Charset charset -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path file -> a
@@ -2149,7 +2149,7 @@ com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.interna
     2:7:void <init>(java.nio.file.Path,java.nio.charset.Charset):87:92 -> <init>
     1:3:java.lang.String getString():103:105 -> a
     1:1:com.android.tools.r8.origin.Origin getOrigin():97:97 -> getOrigin
-com.android.tools.r8.StringResource$StringContentResource -> com.android.tools.r8.internal.Zo1:
+com.android.tools.r8.StringResource$StringContentResource -> com.android.tools.r8.internal.Ro1:
     com.android.tools.r8.origin.Origin origin -> a
     java.lang.String content -> b
     boolean $assertionsDisabled -> c
@@ -2170,7 +2170,7 @@ com.android.tools.r8.Version -> com.android.tools.r8.Version:
     1:1:java.lang.String getPreReleaseString():86:86 -> getPreReleaseString
     1:1:java.lang.String getVersionString():21:21 -> getVersionString
     1:1:boolean isDevelopmentVersion():106:106 -> isDevelopmentVersion
-com.android.tools.r8.algorithms.scc.SCC -> com.android.tools.r8.internal.om1:
+com.android.tools.r8.algorithms.scc.SCC -> com.android.tools.r8.internal.gm1:
     java.util.Deque unassignedStack -> d
     java.util.Set unassignedSet -> c
     java.util.List components -> f
@@ -2246,7 +2246,7 @@ com.android.tools.r8.androidapi.AndroidApiReferenceLevelCache -> com.android.too
 com.android.tools.r8.androidapi.AndroidApiReferenceLevelCache$1 -> com.android.tools.r8.internal.Wy0:
     1:1:void <init>(com.android.tools.r8.graph.AppView):45:45 -> <init>
     1:1:com.android.tools.r8.utils.AndroidApiLevel lookup(com.android.tools.r8.graph.DexReference):48:48 -> a
-com.android.tools.r8.androidapi.AvailableApiExceptions -> com.android.tools.r8.internal.EA0:
+com.android.tools.r8.androidapi.AvailableApiExceptions -> com.android.tools.r8.internal.HA0:
     java.util.Set exceptions -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():24:24 -> <clinit>
@@ -41747,20 +41747,20 @@ com.android.tools.r8.apimodel.AndroidApiDatabasePackageForPackage_org_xmlpull_v1
 com.android.tools.r8.apimodel.AndroidApiDatabasePackageForPackage_org_xmlpull_v1_sax2 -> com.android.tools.r8.internal.Sy0:
 # {"id":"sourceFile","fileName":"AndroidApiDatabasePackageTemplate.java"}
     1:1:com.android.tools.r8.androidapi.AndroidApiClass buildClass(java.lang.String):14:14 -> a
-com.android.tools.r8.bisect.Bisect -> com.android.tools.r8.internal.DB0:
+com.android.tools.r8.bisect.Bisect -> com.android.tools.r8.internal.GB0:
     1:4:com.android.tools.r8.graph.DexProgramClass run(com.android.tools.r8.bisect.BisectState,com.android.tools.r8.bisect.Bisect$Command,java.nio.file.Path,java.util.concurrent.ExecutorService):80:83 -> a
     5:23:void com.android.tools.r8.bisect.Bisect.writeApp(com.android.tools.r8.graph.DexApplication,java.nio.file.Path,java.util.concurrent.ExecutorService):186:204 -> a
     5:23:com.android.tools.r8.graph.DexProgramClass run(com.android.tools.r8.bisect.BisectState,com.android.tools.r8.bisect.Bisect$Command,java.nio.file.Path,java.util.concurrent.ExecutorService):86 -> a
     24:30:com.android.tools.r8.graph.DexProgramClass run(com.android.tools.r8.bisect.BisectState,com.android.tools.r8.bisect.Bisect$Command,java.nio.file.Path,java.util.concurrent.ExecutorService):87:93 -> a
-com.android.tools.r8.bisect.Bisect$Command -> com.android.tools.r8.internal.DB0$a:
+com.android.tools.r8.bisect.Bisect$Command -> com.android.tools.r8.internal.GB0$a:
     com.android.tools.r8.bisect.BisectOptions$Result apply(com.android.tools.r8.graph.DexApplication) -> a
-com.android.tools.r8.bisect.BisectOptions$Result -> com.android.tools.r8.internal.EB0:
+com.android.tools.r8.bisect.BisectOptions$Result -> com.android.tools.r8.internal.HB0:
     com.android.tools.r8.bisect.BisectOptions$Result UNKNOWN -> a
     com.android.tools.r8.bisect.BisectOptions$Result GOOD -> b
     com.android.tools.r8.bisect.BisectOptions$Result BAD -> c
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>(java.lang.String,int):33:33 -> <init>
-com.android.tools.r8.bisect.BisectState -> com.android.tools.r8.internal.IB0:
+com.android.tools.r8.bisect.BisectState -> com.android.tools.r8.internal.LB0:
     java.nio.file.Path stateFile -> e
     com.android.tools.r8.graph.DexApplication badApp -> b
     java.util.Map indexMap -> d
@@ -41837,7 +41837,7 @@ com.android.tools.r8.bisect.BisectState -> com.android.tools.r8.internal.IB0:
     8:10:void write():315 -> d
     11:16:void write():316:321 -> d
     17:27:void write():311:321 -> d
-com.android.tools.r8.bisect.BisectState$Range -> com.android.tools.r8.internal.GB0:
+com.android.tools.r8.bisect.BisectState$Range -> com.android.tools.r8.internal.JB0:
     int end -> b
     boolean $assertionsDisabled -> c
     int start -> a
@@ -41851,14 +41851,14 @@ com.android.tools.r8.bisect.BisectState$Range -> com.android.tools.r8.internal.G
     1:5:boolean equals(java.lang.Object):99:103 -> equals
     1:1:int hashCode():108:108 -> hashCode
     1:1:java.lang.String toString():94:94 -> toString
-com.android.tools.r8.bisect.BisectState$Run -> com.android.tools.r8.internal.HB0:
+com.android.tools.r8.bisect.BisectState$Run -> com.android.tools.r8.internal.KB0:
     boolean good -> a
     com.android.tools.r8.bisect.BisectState$Range range -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():116:116 -> <clinit>
     1:4:void <init>(com.android.tools.r8.bisect.BisectOptions$Result,com.android.tools.r8.bisect.BisectState$Range):120:123 -> <init>
     5:9:void <init>(java.lang.String):126:130 -> <init>
-com.android.tools.r8.cf.CfCodePrinter -> com.android.tools.r8.internal.oD0:
+com.android.tools.r8.cf.CfCodePrinter -> com.android.tools.r8.internal.rD0:
     java.util.Map knownTypeFields -> r
     java.util.Set imports -> j
     boolean pendingComma -> p
@@ -42014,7 +42014,7 @@ com.android.tools.r8.cf.CfCodePrinter -> com.android.tools.r8.internal.oD0:
     1:1:java.util.List getMethods():106:106 -> g
     1:1:java.util.Set getSynthesizedTypes():636:636 -> h
     1:1:java.lang.String immutableListType():193:193 -> i
-com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.internal.GE0:
+com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.internal.JE0:
     java.util.List sortedLabels -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap labelToIndex -> c
     com.android.tools.r8.naming.ClassNameMapper mapper -> f
@@ -42149,7 +42149,7 @@ com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.internal.GE0:
     35:35:void appendType(com.android.tools.r8.graph.DexType):742:742 -> b
     1:2:void newline():706:707 -> c
     1:1:java.lang.String toString():787:787 -> toString
-com.android.tools.r8.cf.CfPrinter$1 -> com.android.tools.r8.internal.FE0:
+com.android.tools.r8.cf.CfPrinter$1 -> com.android.tools.r8.internal.IE0:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> b
     int[] $SwitchMap$com$android$tools$r8$ir$code$MemberType -> c
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> d
@@ -42158,7 +42158,7 @@ com.android.tools.r8.cf.CfPrinter$1 -> com.android.tools.r8.internal.FE0:
     2:2:void <clinit>():644:644 -> <clinit>
     3:3:void <clinit>():306:306 -> <clinit>
     4:4:void <clinit>():262:262 -> <clinit>
-com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.internal.IE0:
+com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.internal.LE0:
     boolean $assertionsDisabled -> n
     int maxRegisterNumber -> l
     com.android.tools.r8.graph.AppView appView -> a
@@ -42262,12 +42262,12 @@ com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.internal.IE0
     10:19:com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry lambda$getTypesAtBlockEntry$0(com.android.tools.r8.ir.code.BasicBlock):368:377 -> b
     20:31:void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):383:394 -> b
     1:1:int registersUsed():123:123 -> c
-com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.internal.HE0:
+com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.internal.KE0:
     java.util.List stack -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap registers -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,java.util.List):71:73 -> <init>
     1:11:java.lang.String toString():78:88 -> toString
-com.android.tools.r8.cf.CfVersion -> com.android.tools.r8.internal.nF0:
+com.android.tools.r8.cf.CfVersion -> com.android.tools.r8.internal.qF0:
     com.android.tools.r8.cf.CfVersion V15 -> l
     boolean $assertionsDisabled -> o
     com.android.tools.r8.cf.CfVersion V16_PREVIEW -> m
@@ -42306,7 +42306,7 @@ com.android.tools.r8.cf.CfVersion -> com.android.tools.r8.internal.nF0:
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():107:107 -> l
     com.android.tools.r8.utils.structural.StructuralItem self() -> q
     1:1:java.lang.String toString():122:122 -> toString
-com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.internal.qP0:
+com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.internal.tP0:
     com.android.tools.r8.ir.code.Phi phi -> q
     1:2:void <init>(com.android.tools.r8.ir.code.Phi):21:22 -> <init>
     boolean isConstant() -> O
@@ -42316,7 +42316,7 @@ com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.internal.qP0:
     2:2:int getRegister(com.android.tools.r8.cf.CfRegisterAllocator):26 -> a
     1:1:com.android.tools.r8.ir.code.Phi getPhi():30:30 -> k0
     1:1:java.lang.String toString():45:45 -> toString
-com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.internal.y51:
+com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.internal.B51:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map clonableConstants -> d
     boolean $assertionsDisabled -> f
@@ -42455,14 +42455,14 @@ com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.internal.y51:
     89:91:void com.android.tools.r8.cf.LoadStoreHelper.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.InstructionListIterator):287:289 -> b
     89:91:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):205 -> b
     92:94:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):206:208 -> b
-com.android.tools.r8.cf.LoadStoreHelper$1 -> com.android.tools.r8.internal.w51:
+com.android.tools.r8.cf.LoadStoreHelper$1 -> com.android.tools.r8.internal.z51:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():64:64 -> <clinit>
-com.android.tools.r8.cf.LoadStoreHelper$PhiMove -> com.android.tools.r8.internal.x51:
+com.android.tools.r8.cf.LoadStoreHelper$PhiMove -> com.android.tools.r8.internal.A51:
     com.android.tools.r8.ir.code.Phi phi -> a
     com.android.tools.r8.ir.code.Value operand -> b
     1:3:void <init>(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):235:237 -> <init>
-com.android.tools.r8.cf.TypeVerificationHelper -> com.android.tools.r8.internal.Lr1:
+com.android.tools.r8.cf.TypeVerificationHelper -> com.android.tools.r8.internal.Dr1:
     boolean computingVerificationTypes -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.AppView appView -> e
@@ -42506,10 +42506,10 @@ com.android.tools.r8.cf.TypeVerificationHelper -> com.android.tools.r8.internal.
     22:22:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):167:167 -> b
     23:23:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):165:165 -> b
     24:24:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):163:163 -> b
-com.android.tools.r8.cf.TypeVerificationHelper$1 -> com.android.tools.r8.internal.Gr1:
+com.android.tools.r8.cf.TypeVerificationHelper$1 -> com.android.tools.r8.internal.yr1:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():161:161 -> <clinit>
-com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.android.tools.r8.internal.Hr1:
+com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.android.tools.r8.internal.zr1:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():41:41 -> <clinit>
@@ -42517,7 +42517,7 @@ com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.androi
     2:4:void <init>(com.android.tools.r8.graph.DexType):44:46 -> <init>
     1:1:com.android.tools.r8.graph.DexType getDexType():51:51 -> a
     1:1:java.lang.String toString():56:56 -> toString
-com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.tools.r8.internal.Ir1:
+com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.tools.r8.internal.Ar1:
     com.android.tools.r8.ir.code.NewInstance newInstance -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():60:60 -> <clinit>
@@ -42527,7 +42527,7 @@ com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.to
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo.getDexType():70:70 -> toString
     2:2:java.lang.String toString():75 -> toString
     3:3:java.lang.String toString():75:75 -> toString
-com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo -> com.android.tools.r8.internal.Jr1:
+com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo -> com.android.tools.r8.internal.Br1:
     com.android.tools.r8.ir.code.Argument thisArgument -> b
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> c
@@ -42538,9 +42538,9 @@ com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo -> com.android.t
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo.getDexType():92:92 -> toString
     2:2:java.lang.String toString():97 -> toString
     3:3:java.lang.String toString():97:97 -> toString
-com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo -> com.android.tools.r8.internal.Kr1:
+com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo -> com.android.tools.r8.internal.Cr1:
     com.android.tools.r8.graph.DexType getDexType() -> a
-com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.internal.XC0:
+com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.internal.aD0:
     com.android.tools.r8.ir.code.NumericType type -> b
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode opcode -> a
     int $r8$clinit -> d
@@ -42574,12 +42574,12 @@ com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.internal.
     34:34:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):212:212 -> a
     1:1:boolean canThrow():166:166 -> o
     1:1:int getCompareToId():52:52 -> q
-com.android.tools.r8.cf.code.CfArithmeticBinop$1 -> com.android.tools.r8.internal.WC0:
+com.android.tools.r8.cf.code.CfArithmeticBinop$1 -> com.android.tools.r8.internal.ZC0:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> b
     int[] $SwitchMap$com$android$tools$r8$cf$code$CfArithmeticBinop$Opcode -> a
     1:1:void <clinit>():134:134 -> <clinit>
     2:2:void <clinit>():117:117 -> <clinit>
-com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.internal.XC0$a:
+com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.internal.aD0$a:
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode[] $VALUES -> f
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Sub -> b
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Add -> a
@@ -42590,7 +42590,7 @@ com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.in
     6:6:void <clinit>():32:32 -> <clinit>
     1:1:void <init>(java.lang.String,int):32:32 -> <init>
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode[] values():32:32 -> a
-com.android.tools.r8.cf.code.CfArrayLength -> com.android.tools.r8.internal.YC0:
+com.android.tools.r8.cf.code.CfArrayLength -> com.android.tools.r8.internal.bD0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():27:27 -> <clinit>
     1:1:void <init>():27:27 -> <init>
@@ -42606,7 +42606,7 @@ com.android.tools.r8.cf.code.CfArrayLength -> com.android.tools.r8.internal.YC0:
     12:12:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
     12:12:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):86 -> a
     int getCompareToId() -> q
-com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.internal.ZC0:
+com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.internal.cD0:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.ir.code.MemberType type -> a
     1:1:void <clinit>():31:31 -> <clinit>
@@ -42636,7 +42636,7 @@ com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.internal.ZC0:
     50:51:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):132:133 -> a
     boolean canThrow() -> o
     1:1:int getCompareToId():42:42 -> q
-com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.internal.aD0:
+com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.internal.dD0:
     com.android.tools.r8.ir.code.MemberType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.MemberType):34:35 -> <init>
     1:19:int getStoreType():54:72 -> C
@@ -42651,7 +42651,7 @@ com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.internal.aD0:
     10:12:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):122:124 -> a
     boolean canThrow() -> o
     1:1:int getCompareToId():44:44 -> q
-com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.internal.eD0:
+com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.internal.hD0:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):34:35 -> <init>
     boolean isTypeInstruction() -> B
@@ -42674,7 +42674,7 @@ com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.internal.eD0:
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> n
     boolean canThrow() -> o
     int getCompareToId() -> q
-com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.internal.lD0:
+com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.internal.oD0:
     com.android.tools.r8.ir.code.Cmp$Bias bias -> a
     com.android.tools.r8.ir.code.NumericType type -> b
     boolean $assertionsDisabled -> c
@@ -42698,10 +42698,10 @@ com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.internal.lD0:
     12:12:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
     12:12:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):137 -> a
     1:1:int getCompareToId():49:49 -> q
-com.android.tools.r8.cf.code.CfCmp$1 -> com.android.tools.r8.internal.kD0:
+com.android.tools.r8.cf.code.CfCmp$1 -> com.android.tools.r8.internal.nD0:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():84:84 -> <clinit>
-com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.internal.qD0:
+com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.internal.tD0:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):34:35 -> <init>
     boolean isTypeInstruction() -> B
@@ -42737,7 +42737,7 @@ com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.internal.qD0:
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> n
     boolean canThrow() -> o
     int getCompareToId() -> q
-com.android.tools.r8.cf.code.CfConstDynamic -> com.android.tools.r8.internal.rD0:
+com.android.tools.r8.cf.code.CfConstDynamic -> com.android.tools.r8.internal.uD0:
     com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference reference -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():40:40 -> <clinit>
@@ -42782,7 +42782,7 @@ com.android.tools.r8.cf.code.CfConstDynamic -> com.android.tools.r8.internal.rD0
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> n
     boolean canThrow() -> o
     int getCompareToId() -> q
-com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.internal.sD0:
+com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.internal.vD0:
     com.android.tools.r8.graph.DexMethodHandle handle -> a
     1:2:void <init>(com.android.tools.r8.graph.DexMethodHandle):34:35 -> <init>
     1:1:com.android.tools.r8.graph.DexMethodHandle getHandle():39:39 -> C
@@ -42799,7 +42799,7 @@ com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.interna
     14:14:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):107 -> a
     boolean canThrow() -> o
     int getCompareToId() -> q
-com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.internal.tD0:
+com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.internal.wD0:
     com.android.tools.r8.graph.DexProto type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexProto):34:35 -> <init>
     1:1:com.android.tools.r8.graph.DexProto getType():39:39 -> C
@@ -42818,13 +42818,13 @@ com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.internal.
     13:13:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):105 -> a
     boolean canThrow() -> o
     int getCompareToId() -> q
-com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.internal.uD0:
+com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.internal.xD0:
     1:1:void <init>():27:27 -> <init>
     1:1:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):39:39 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):50:50 -> a
     3:3:void print(com.android.tools.r8.cf.CfPrinter):55:55 -> a
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):60:60 -> a
-    5:5:void com.android.tools.r8.ir.conversion.IRBuilder.addNullConst(int):1252:1252 -> a
+    5:5:void com.android.tools.r8.ir.conversion.IRBuilder.addNullConst(int):1268:1268 -> a
     5:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):60 -> a
     6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):66:66 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():106:106 -> a
@@ -42833,7 +42833,7 @@ com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.internal.uD0:
     9:9:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
     9:9:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):78 -> a
     int getCompareToId() -> q
-com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.internal.wD0:
+com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.internal.zD0:
     com.android.tools.r8.ir.code.ValueType type -> b
     long value -> a
     int $r8$clinit -> d
@@ -42871,10 +42871,10 @@ com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.internal.wD0:
     98:98:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
     98:98:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):181 -> a
     int getCompareToId() -> q
-com.android.tools.r8.cf.code.CfConstNumber$1 -> com.android.tools.r8.internal.vD0:
+com.android.tools.r8.cf.code.CfConstNumber$1 -> com.android.tools.r8.internal.yD0:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():92:92 -> <clinit>
-com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.internal.xD0:
+com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.internal.AD0:
     com.android.tools.r8.graph.DexString string -> a
     1:2:void <init>(com.android.tools.r8.graph.DexString):30:31 -> <init>
     1:1:com.android.tools.r8.graph.DexString getString():46:46 -> C
@@ -42894,7 +42894,7 @@ com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.internal.xD0:
     com.android.tools.r8.cf.code.CfConstString asConstString() -> c
     boolean canThrow() -> o
     int getCompareToId() -> q
-com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.internal.yD0:
+com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.internal.BD0:
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> b
     com.android.tools.r8.graph.DexReference item -> a
     boolean $assertionsDisabled -> c
@@ -42910,7 +42910,7 @@ com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.i
     6:6:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):99 -> a
     7:8:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):99:100 -> a
     9:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):106:107 -> a
-    11:14:void com.android.tools.r8.ir.conversion.IRBuilder.addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1305:1308 -> a
+    11:14:void com.android.tools.r8.ir.conversion.IRBuilder.addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1321:1324 -> a
     11:14:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):106 -> a
     15:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):115:115 -> a
     16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDexItemBasedConstString(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.ProgramMethod):94:94 -> a
@@ -42921,7 +42921,7 @@ com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.i
     com.android.tools.r8.cf.code.CfDexItemBasedConstString asDexItemBasedConstString() -> d
     boolean canThrow() -> o
     int getCompareToId() -> q
-com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.internal.zD0:
+com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.internal.CD0:
     com.android.tools.r8.graph.DexField field -> b
     com.android.tools.r8.graph.DexField declaringField -> c
     int opcode -> a
@@ -42966,7 +42966,7 @@ com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.internal
     com.android.tools.r8.cf.code.CfFieldInstruction asFieldInstruction() -> e
     boolean canThrow() -> o
     1:1:int getCompareToId():66:66 -> q
-com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.internal.ID0:
+com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.internal.LD0:
     java.util.Deque stack -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap locals -> a
     boolean $assertionsDisabled -> c
@@ -43010,8 +43010,8 @@ com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.internal.ID0:
     com.android.tools.r8.cf.code.CfFrame asFrame() -> f
     int getCompareToId() -> q
     1:1:java.lang.String toString():450:450 -> toString
-com.android.tools.r8.cf.code.CfFrame$1 -> com.android.tools.r8.internal.AD0:
-com.android.tools.r8.cf.code.CfFrame$FrameType -> com.android.tools.r8.internal.BD0:
+com.android.tools.r8.cf.code.CfFrame$1 -> com.android.tools.r8.internal.DD0:
+com.android.tools.r8.cf.code.CfFrame$FrameType -> com.android.tools.r8.internal.ED0:
     1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):40:40 -> <init>
     2:2:void <init>():108:108 -> <init>
     com.android.tools.r8.graph.DexType getInitializedType() -> a
@@ -43040,7 +43040,7 @@ com.android.tools.r8.cf.code.CfFrame$FrameType -> com.android.tools.r8.internal.
     boolean isWide() -> h
     1:1:com.android.tools.r8.cf.code.CfFrame$FrameType top():55:55 -> i
     1:1:com.android.tools.r8.cf.code.CfFrame$FrameType uninitializedThis():51:51 -> j
-com.android.tools.r8.cf.code.CfFrame$InitializedType -> com.android.tools.r8.internal.CD0:
+com.android.tools.r8.cf.code.CfFrame$InitializedType -> com.android.tools.r8.internal.FD0:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():165:165 -> <clinit>
@@ -43055,28 +43055,28 @@ com.android.tools.r8.cf.code.CfFrame$InitializedType -> com.android.tools.r8.int
     29:29:com.android.tools.r8.graph.DexType getInitializedType():213:213 -> a
     1:1:boolean isWide():203:203 -> h
     1:1:java.lang.String toString():176:176 -> toString
-com.android.tools.r8.cf.code.CfFrame$OneWord -> com.android.tools.r8.internal.DD0:
+com.android.tools.r8.cf.code.CfFrame$OneWord -> com.android.tools.r8.internal.GD0:
     com.android.tools.r8.cf.code.CfFrame$OneWord SINGLETON -> a
     1:1:void <clinit>():294:294 -> <clinit>
     1:1:void <init>():292:292 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):298:298 -> a
     1:1:com.android.tools.r8.cf.code.CfFrame$OneWord access$400():292:292 -> k
     1:1:java.lang.String toString():308:308 -> toString
-com.android.tools.r8.cf.code.CfFrame$Top -> com.android.tools.r8.internal.ED0:
+com.android.tools.r8.cf.code.CfFrame$Top -> com.android.tools.r8.internal.HD0:
     com.android.tools.r8.cf.code.CfFrame$Top SINGLETON -> a
     1:1:void <clinit>():219:219 -> <clinit>
     1:1:void <init>():217:217 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):228:228 -> a
     1:1:com.android.tools.r8.cf.code.CfFrame$Top access$300():217:217 -> k
     1:1:java.lang.String toString():223:223 -> toString
-com.android.tools.r8.cf.code.CfFrame$TwoWord -> com.android.tools.r8.internal.FD0:
+com.android.tools.r8.cf.code.CfFrame$TwoWord -> com.android.tools.r8.internal.ID0:
     com.android.tools.r8.cf.code.CfFrame$TwoWord SINGLETON -> a
     1:1:void <clinit>():314:314 -> <clinit>
     1:1:void <init>():312:312 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):318:318 -> a
     1:1:com.android.tools.r8.cf.code.CfFrame$TwoWord access$500():312:312 -> k
     1:1:java.lang.String toString():333:333 -> toString
-com.android.tools.r8.cf.code.CfFrame$UninitializedNew -> com.android.tools.r8.internal.GD0:
+com.android.tools.r8.cf.code.CfFrame$UninitializedNew -> com.android.tools.r8.internal.JD0:
     com.android.tools.r8.cf.code.CfLabel label -> a
     com.android.tools.r8.graph.DexType type -> b
     1:1:void <init>(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType,com.android.tools.r8.cf.code.CfFrame$1):237:237 -> <init>
@@ -43085,12 +43085,12 @@ com.android.tools.r8.cf.code.CfFrame$UninitializedNew -> com.android.tools.r8.in
     1:1:com.android.tools.r8.cf.code.CfLabel getUninitializedLabel():263:263 -> b
     1:1:com.android.tools.r8.graph.DexType getUninitializedNewType():268:268 -> c
     1:1:java.lang.String toString():248:248 -> toString
-com.android.tools.r8.cf.code.CfFrame$UninitializedThis -> com.android.tools.r8.internal.HD0:
+com.android.tools.r8.cf.code.CfFrame$UninitializedThis -> com.android.tools.r8.internal.KD0:
     1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):272:272 -> <init>
     2:2:void <init>():274:274 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):278:278 -> a
     1:1:java.lang.String toString():283:283 -> toString
-com.android.tools.r8.cf.code.CfFrameVerificationHelper -> com.android.tools.r8.internal.JD0:
+com.android.tools.r8.cf.code.CfFrameVerificationHelper -> com.android.tools.r8.internal.MD0:
     java.util.Map stateMap -> d
     com.android.tools.r8.graph.GraphLens graphLens -> g
     java.util.Set tryCatchRangeLabels -> j
@@ -43217,7 +43217,7 @@ com.android.tools.r8.cf.code.CfFrameVerificationHelper -> com.android.tools.r8.i
     10:10:boolean isUninitializedThisAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):261 -> c
     11:11:boolean isUninitializedThisAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):261:261 -> c
     1:1:void setNoFrame():254:254 -> d
-com.android.tools.r8.cf.code.CfGoto -> com.android.tools.r8.internal.KD0:
+com.android.tools.r8.cf.code.CfGoto -> com.android.tools.r8.internal.ND0:
     com.android.tools.r8.cf.code.CfLabel target -> a
     1:2:void <init>(com.android.tools.r8.cf.code.CfLabel):30:31 -> <init>
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):42:42 -> a
@@ -43232,7 +43232,7 @@ com.android.tools.r8.cf.code.CfGoto -> com.android.tools.r8.internal.KD0:
     8:9:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):101:102 -> a
     int getCompareToId() -> q
     1:1:com.android.tools.r8.cf.code.CfLabel getTarget():62:62 -> r
-com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.internal.MD0:
+com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.internal.PD0:
     com.android.tools.r8.ir.code.If$Type kind -> a
     com.android.tools.r8.ir.code.ValueType type -> b
     com.android.tools.r8.cf.code.CfLabel target -> c
@@ -43258,10 +43258,10 @@ com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.internal.MD0:
     1:1:int getCompareToId():44:44 -> q
     1:1:com.android.tools.r8.cf.code.CfLabel getTarget():66:66 -> r
     boolean isJump() -> z
-com.android.tools.r8.cf.code.CfIf$1 -> com.android.tools.r8.internal.LD0:
+com.android.tools.r8.cf.code.CfIf$1 -> com.android.tools.r8.internal.OD0:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():70:70 -> <clinit>
-com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.internal.OD0:
+com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.internal.RD0:
     com.android.tools.r8.ir.code.If$Type kind -> a
     com.android.tools.r8.ir.code.ValueType type -> b
     com.android.tools.r8.cf.code.CfLabel target -> c
@@ -43279,9 +43279,9 @@ com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.internal.OD0:
     6:6:void print(com.android.tools.r8.cf.CfPrinter):90:90 -> a
     7:7:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):103:103 -> a
     8:12:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):118:122 -> a
-    13:13:void com.android.tools.r8.ir.conversion.IRBuilder.addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int,int):1452:1452 -> a
+    13:13:void com.android.tools.r8.ir.conversion.IRBuilder.addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int,int):1468:1468 -> a
     13:13:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):122 -> a
-    14:14:void com.android.tools.r8.ir.conversion.IRBuilder.addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int,int):1450:1450 -> a
+    14:14:void com.android.tools.r8.ir.conversion.IRBuilder.addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int,int):1466:1466 -> a
     14:14:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):122 -> a
     15:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):128:128 -> a
     16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():267:267 -> a
@@ -43291,10 +43291,10 @@ com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.internal.OD0:
     1:1:com.android.tools.r8.cf.code.CfLabel getTarget():66:66 -> r
     boolean isConditionalJump() -> s
     boolean isJump() -> z
-com.android.tools.r8.cf.code.CfIfCmp$1 -> com.android.tools.r8.internal.ND0:
+com.android.tools.r8.cf.code.CfIfCmp$1 -> com.android.tools.r8.internal.QD0:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():70:70 -> <clinit>
-com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.internal.PD0:
+com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.internal.SD0:
     int increment -> b
     int var -> a
     1:3:void <init>(int,int):37:39 -> <init>
@@ -43308,7 +43308,7 @@ com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.internal.PD0:
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):88:88 -> a
     8:8:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):98:98 -> a
     int getCompareToId() -> q
-com.android.tools.r8.cf.code.CfInitClass -> com.android.tools.r8.internal.QD0:
+com.android.tools.r8.cf.code.CfInitClass -> com.android.tools.r8.internal.TD0:
     com.android.tools.r8.graph.DexType clazz -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):35:36 -> <init>
     1:1:com.android.tools.r8.graph.DexType getClassValue():40:40 -> C
@@ -43328,7 +43328,7 @@ com.android.tools.r8.cf.code.CfInitClass -> com.android.tools.r8.internal.QD0:
     16:16:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):120 -> a
     boolean canThrow() -> o
     int getCompareToId() -> q
-com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.internal.RD0:
+com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.internal.UD0:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):33:34 -> <init>
     boolean isTypeInstruction() -> B
@@ -43352,7 +43352,7 @@ com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.internal.RD0:
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> n
     boolean canThrow() -> o
     int getCompareToId() -> q
-com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.internal.SD0:
+com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.internal.VD0:
     1:1:void <init>():30:30 -> <init>
     boolean isReturn() -> A
     boolean isTypeInstruction() -> B
@@ -43392,7 +43392,7 @@ com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.internal.SD0:
     boolean isInvokeStatic() -> x
     boolean isInvokeVirtual() -> y
     boolean isJump() -> z
-com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.internal.ZD0:
+com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.internal.cE0:
     int opcode -> b
     com.android.tools.r8.graph.DexMethod method -> a
     boolean itf -> c
@@ -43456,7 +43456,7 @@ com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.internal.ZD0:
     1:1:boolean isInvokeSpecial():186:186 -> w
     1:1:boolean isInvokeStatic():191:191 -> x
     1:1:boolean isInvokeVirtual():196:196 -> y
-com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.internal.aE0:
+com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.internal.dE0:
     com.android.tools.r8.graph.DexCallSite callSite -> a
     1:2:void <init>(com.android.tools.r8.graph.DexCallSite):43:44 -> <init>
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():125:125 -> C
@@ -43491,7 +43491,7 @@ com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.internal.aE
     com.android.tools.r8.cf.code.CfInvokeDynamic asInvokeDynamic() -> i
     boolean canThrow() -> o
     int getCompareToId() -> q
-com.android.tools.r8.cf.code.CfJsrRet -> com.android.tools.r8.internal.bE0:
+com.android.tools.r8.cf.code.CfJsrRet -> com.android.tools.r8.internal.eE0:
     int local -> a
     1:2:void <init>(int):36:37 -> <init>
     1:1:com.android.tools.r8.errors.CompilationError error():30:30 -> C
@@ -43506,7 +43506,7 @@ com.android.tools.r8.cf.code.CfJsrRet -> com.android.tools.r8.internal.bE0:
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):77:77 -> a
     6:6:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):89:89 -> a
     1:1:int getCompareToId():42:42 -> q
-com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.internal.cE0:
+com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.internal.fE0:
     com.android.tools.r8.org.objectweb.asm.Label label -> a
     1:3:void <init>():26:28 -> <init>
     1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():31:34 -> C
@@ -43521,7 +43521,7 @@ com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.internal.cE0:
     com.android.tools.r8.cf.code.CfLabel asLabel() -> j
     boolean emitsIR() -> p
     int getCompareToId() -> q
-com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.internal.iE0:
+com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.internal.lE0:
     com.android.tools.r8.ir.code.ValueType type -> b
     int var -> a
     1:3:void <init>(com.android.tools.r8.ir.code.ValueType,int):34:36 -> <init>
@@ -43537,7 +43537,7 @@ com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.internal.iE0:
     6:6:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):131:131 -> a
     7:7:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):130:130 -> a
     8:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):105:107 -> a
-    11:11:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> a
+    11:11:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> a
     11:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):107 -> a
     12:12:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):118:118 -> a
     13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forLoad():271:271 -> a
@@ -43545,10 +43545,10 @@ com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.internal.iE0:
     com.android.tools.r8.cf.code.CfLoad asLoad() -> k
     boolean emitsIR() -> p
     1:1:int getCompareToId():41:41 -> q
-com.android.tools.r8.cf.code.CfLoad$1 -> com.android.tools.r8.internal.hE0:
+com.android.tools.r8.cf.code.CfLoad$1 -> com.android.tools.r8.internal.kE0:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():51:51 -> <clinit>
-com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.internal.kE0:
+com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.internal.nE0:
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode opcode -> a
     com.android.tools.r8.ir.code.NumericType type -> b
     boolean $assertionsDisabled -> c
@@ -43581,7 +43581,7 @@ com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.internal.kE0
     37:37:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):183 -> a
     38:47:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):185:194 -> a
     1:1:int getCompareToId():54:54 -> q
-com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.internal.jE0:
+com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.internal.mE0:
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode Shl -> a
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode[] $VALUES -> g
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode And -> d
@@ -43592,7 +43592,7 @@ com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.inter
     1:6:void <clinit>():33:38 -> <clinit>
     7:7:void <clinit>():32:32 -> <clinit>
     1:1:void <init>(java.lang.String,int):32:32 -> <init>
-com.android.tools.r8.cf.code.CfMonitor -> com.android.tools.r8.internal.lE0:
+com.android.tools.r8.cf.code.CfMonitor -> com.android.tools.r8.internal.oE0:
     com.android.tools.r8.ir.code.Monitor$Type type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.Monitor$Type):33:34 -> <init>
     1:1:com.android.tools.r8.ir.code.Monitor$Type getType():38:38 -> C
@@ -43611,7 +43611,7 @@ com.android.tools.r8.cf.code.CfMonitor -> com.android.tools.r8.internal.lE0:
     boolean canThrow() -> o
     1:1:int com.android.tools.r8.cf.code.CfMonitor.getAsmOpcode():66:66 -> q
     1:1:int getCompareToId():43 -> q
-com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.internal.mE0:
+com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.internal.pE0:
     com.android.tools.r8.graph.DexType type -> a
     int dimensions -> b
     boolean $assertionsDisabled -> c
@@ -43641,7 +43641,7 @@ com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.internal.m
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> n
     boolean canThrow() -> o
     int getCompareToId() -> q
-com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.internal.oE0:
+com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.internal.rE0:
     com.android.tools.r8.ir.code.NumericType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType):34:35 -> <init>
     1:14:int getAsmOpcode():72:85 -> C
@@ -43658,10 +43658,10 @@ com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.internal.oE0:
     9:9:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):125 -> a
     10:10:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):126:126 -> a
     1:1:int getCompareToId():44:44 -> q
-com.android.tools.r8.cf.code.CfNeg$1 -> com.android.tools.r8.internal.nE0:
+com.android.tools.r8.cf.code.CfNeg$1 -> com.android.tools.r8.internal.qE0:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():72:72 -> <clinit>
-com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.internal.pE0:
+com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.internal.sE0:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):34:35 -> <init>
     boolean isTypeInstruction() -> B
@@ -43681,7 +43681,7 @@ com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.internal.pE0:
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> n
     boolean canThrow() -> o
     int getCompareToId() -> q
-com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.internal.qE0:
+com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.internal.tE0:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():32:32 -> <clinit>
@@ -43715,7 +43715,7 @@ com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.internal.qE0:
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> n
     boolean canThrow() -> o
     1:1:int getCompareToId():63:63 -> q
-com.android.tools.r8.cf.code.CfNewUnboxedEnum -> com.android.tools.r8.internal.rE0:
+com.android.tools.r8.cf.code.CfNewUnboxedEnum -> com.android.tools.r8.internal.uE0:
     com.android.tools.r8.graph.DexType type -> a
     int ordinal -> b
     1:3:void <init>(com.android.tools.r8.graph.DexType,int):37:39 -> <init>
@@ -43726,7 +43726,7 @@ com.android.tools.r8.cf.code.CfNewUnboxedEnum -> com.android.tools.r8.internal.r
     3:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):83:83 -> a
     4:4:void print(com.android.tools.r8.cf.CfPrinter):88:88 -> a
     5:5:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):94:94 -> a
-    6:6:void com.android.tools.r8.graph.UseRegistry.registerNewUnboxedEnumInstance(com.android.tools.r8.graph.DexType):59:59 -> a
+    6:6:void com.android.tools.r8.graph.UseRegistry.registerNewUnboxedEnumInstance(com.android.tools.r8.graph.DexType):70:70 -> a
     6:6:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):94 -> a
     7:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):104:104 -> a
     8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):110:110 -> a
@@ -43737,7 +43737,7 @@ com.android.tools.r8.cf.code.CfNewUnboxedEnum -> com.android.tools.r8.internal.r
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> n
     boolean canThrow() -> o
     int getCompareToId() -> q
-com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.internal.sE0:
+com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.internal.vE0:
     1:1:void <init>():26:26 -> <init>
     void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens) -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):36:36 -> a
@@ -43747,7 +43747,7 @@ com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.internal.sE0:
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):70:70 -> a
     boolean emitsIR() -> p
     int getCompareToId() -> q
-com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.internal.uE0:
+com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.internal.xE0:
     com.android.tools.r8.ir.code.NumericType to -> b
     com.android.tools.r8.ir.code.NumericType from -> a
     boolean $assertionsDisabled -> c
@@ -43774,10 +43774,10 @@ com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.internal
     11:11:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):198 -> a
     12:12:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):198:198 -> a
     1:1:int getCompareToId():46:46 -> q
-com.android.tools.r8.cf.code.CfNumberConversion$1 -> com.android.tools.r8.internal.tE0:
+com.android.tools.r8.cf.code.CfNumberConversion$1 -> com.android.tools.r8.internal.wE0:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():84:84 -> <clinit>
-com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.internal.wE0:
+com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.internal.zE0:
     com.android.tools.r8.cf.code.CfLabel label -> a
     com.android.tools.r8.ir.code.Position position -> b
     1:3:void <init>(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.ir.code.Position):33:35 -> <init>
@@ -43797,7 +43797,7 @@ com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.internal.wE0:
     com.android.tools.r8.cf.code.CfPosition asPosition() -> l
     boolean emitsIR() -> p
     int getCompareToId() -> q
-com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.internal.KE0:
+com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.internal.NE0:
     com.android.tools.r8.ir.code.ValueType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():29:29 -> <clinit>
@@ -43814,10 +43814,10 @@ com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.internal.KE0:
     8:10:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):116:118 -> a
     1:1:int getCompareToId():43:43 -> q
     boolean isJump() -> z
-com.android.tools.r8.cf.code.CfReturn$1 -> com.android.tools.r8.internal.JE0:
+com.android.tools.r8.cf.code.CfReturn$1 -> com.android.tools.r8.internal.ME0:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():53:53 -> <clinit>
-com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.internal.LE0:
+com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.internal.OE0:
     1:1:void <init>():26:26 -> <init>
     boolean isReturn() -> A
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):41:41 -> a
@@ -43830,11 +43830,11 @@ com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.internal.LE0:
     7:7:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):90:90 -> a
     int getCompareToId() -> q
     boolean isJump() -> z
-com.android.tools.r8.cf.code.CfSafeCheckCast -> com.android.tools.r8.internal.ME0:
+com.android.tools.r8.cf.code.CfSafeCheckCast -> com.android.tools.r8.internal.PE0:
     1:1:void <init>(com.android.tools.r8.graph.DexType):17:17 -> <init>
     1:1:void addCheckCast(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState$Slot):22:22 -> a
     2:2:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):28:28 -> a
-com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.internal.TE0:
+com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.internal.WE0:
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode opcode -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():31:31 -> <clinit>
@@ -43861,32 +43861,32 @@ com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.internal
     159:174:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):210:225 -> a
     175:184:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):317:326 -> a
     175:184:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
-    185:185:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> a
+    185:185:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> a
     185:185:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):326 -> a
     185:185:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
     186:186:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):328:328 -> a
     186:186:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
-    187:187:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> a
+    187:187:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> a
     187:187:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):328 -> a
     187:187:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
     188:188:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):330:330 -> a
     188:188:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
-    189:189:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> a
+    189:189:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> a
     189:189:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):330 -> a
     189:189:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
     190:190:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):332:332 -> a
     190:190:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
-    191:191:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> a
+    191:191:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> a
     191:191:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):332 -> a
     191:191:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
     192:192:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):334:334 -> a
     192:192:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
-    193:193:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> a
+    193:193:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> a
     193:193:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):334 -> a
     193:193:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
     194:194:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):336:336 -> a
     194:194:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
-    195:195:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> a
+    195:195:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> a
     195:195:void com.android.tools.r8.cf.code.CfStackInstruction.dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):336 -> a
     195:195:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):230 -> a
     196:196:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):226:226 -> a
@@ -43899,41 +43899,41 @@ com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.internal
     201:201:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):218:218 -> a
     202:210:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):181:189 -> a
     211:213:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):169:171 -> a
-    214:214:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> a
+    214:214:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> a
     214:214:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):171 -> a
     215:216:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):173:174 -> a
-    217:217:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> a
+    217:217:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> a
     217:217:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):174 -> a
     218:218:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):175:175 -> a
-    219:219:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> a
+    219:219:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> a
     219:219:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):175 -> a
     220:228:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):155:163 -> a
     229:233:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):146:150 -> a
     234:236:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):139:141 -> a
-    237:237:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> a
+    237:237:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> a
     237:237:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):141 -> a
     238:241:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):130:133 -> a
     242:243:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):124:125 -> a
     244:249:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):253:258 -> a
-    250:250:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> a
+    250:250:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> a
     250:250:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):258 -> a
     251:251:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):260:260 -> a
-    252:252:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> a
+    252:252:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> a
     252:252:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):260 -> a
     253:253:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):262:262 -> a
-    254:254:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> a
+    254:254:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> a
     254:254:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):262 -> a
     255:261:void dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):270:276 -> a
-    262:262:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> a
+    262:262:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> a
     262:262:void dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):276 -> a
     263:263:void dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):278:278 -> a
-    264:264:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> a
+    264:264:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> a
     264:264:void dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):278 -> a
     265:265:void dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):280:280 -> a
-    266:266:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> a
+    266:266:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> a
     266:266:void dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):280 -> a
     267:267:void dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):282:282 -> a
-    268:268:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> a
+    268:268:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> a
     268:268:void dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):282 -> a
     269:269:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):347:347 -> a
     270:421:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):358:509 -> a
@@ -44038,26 +44038,26 @@ com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.internal
     528:529:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):125:126 -> a
     528:529:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):362 -> a
     1:8:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):289:296 -> b
-    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> b
+    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> b
     9:9:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):296 -> b
     10:10:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):298:298 -> b
-    11:11:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> b
+    11:11:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> b
     11:11:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):298 -> b
     12:12:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):300:300 -> b
-    13:13:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> b
+    13:13:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> b
     13:13:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):300 -> b
     14:14:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):302:302 -> b
-    15:15:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> b
+    15:15:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> b
     15:15:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):302 -> b
     16:16:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):304:304 -> b
-    17:17:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> b
+    17:17:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> b
     17:17:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):304 -> b
     boolean emitsIR() -> p
     1:1:int getCompareToId():88:88 -> q
-com.android.tools.r8.cf.code.CfStackInstruction$1 -> com.android.tools.r8.internal.SE0:
+com.android.tools.r8.cf.code.CfStackInstruction$1 -> com.android.tools.r8.internal.VE0:
     int[] $SwitchMap$com$android$tools$r8$cf$code$CfStackInstruction$Opcode -> a
     1:1:void <clinit>():121:121 -> <clinit>
-com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.internal.TE0$a:
+com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.internal.WE0$a:
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Swap -> j
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode[] $VALUES -> k
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Dup2X2 -> i
@@ -44074,7 +44074,7 @@ com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.i
     1:2:void <init>(java.lang.String,int,int):46:47 -> <init>
     1:1:int access$000(com.android.tools.r8.cf.code.CfStackInstruction$Opcode):33:33 -> a
     2:2:com.android.tools.r8.cf.code.CfStackInstruction$Opcode[] values():33:33 -> a
-com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.internal.gF0:
+com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.internal.jF0:
     com.android.tools.r8.ir.code.ValueType type -> b
     int var -> a
     1:3:void <init>(com.android.tools.r8.ir.code.ValueType,int):37:39 -> <init>
@@ -44085,7 +44085,7 @@ com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.internal.gF0:
     2:2:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):90:90 -> a
     3:3:void print(com.android.tools.r8.cf.CfPrinter):95:95 -> 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):108:109 -> a
-    6:6:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> a
+    6:6:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> 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):109 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):120:120 -> a
     8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():323:323 -> a
@@ -44100,10 +44100,10 @@ com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.internal.gF0:
     com.android.tools.r8.cf.code.CfStore asStore() -> m
     boolean emitsIR() -> p
     1:1:int getCompareToId():44:44 -> q
-com.android.tools.r8.cf.code.CfStore$1 -> com.android.tools.r8.internal.fF0:
+com.android.tools.r8.cf.code.CfStore$1 -> com.android.tools.r8.internal.iF0:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():54:54 -> <clinit>
-com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.internal.iF0:
+com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.internal.lF0:
     com.android.tools.r8.cf.code.CfLabel defaultTarget -> b
     int[] keys -> c
     java.util.List targets -> d
@@ -44133,17 +44133,17 @@ com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.internal.iF0:
     31:36:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):153:158 -> a
     1:1:int getCompareToId():50:50 -> q
     boolean isJump() -> z
-com.android.tools.r8.cf.code.CfSwitch$1 -> com.android.tools.r8.internal.hF0:
+com.android.tools.r8.cf.code.CfSwitch$1 -> com.android.tools.r8.internal.kF0:
     int[] $SwitchMap$com$android$tools$r8$cf$code$CfSwitch$Kind -> a
     1:1:void <clinit>():111:111 -> <clinit>
-com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.internal.iF0$a:
+com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.internal.lF0$a:
     com.android.tools.r8.cf.code.CfSwitch$Kind[] $VALUES -> c
     com.android.tools.r8.cf.code.CfSwitch$Kind TABLE -> b
     com.android.tools.r8.cf.code.CfSwitch$Kind LOOKUP -> a
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>(java.lang.String,int):32:32 -> <init>
     1:1:com.android.tools.r8.cf.code.CfSwitch$Kind[] values():32:32 -> a
-com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.internal.jF0:
+com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.internal.mF0:
     1:1:void <init>():27:27 -> <init>
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):42:42 -> a
     2:2:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):65:65 -> a
@@ -44156,7 +44156,7 @@ com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.internal.jF0:
     boolean canThrow() -> o
     int getCompareToId() -> q
     boolean isJump() -> z
-com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.internal.kF0:
+com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.internal.nF0:
     com.android.tools.r8.cf.code.CfLabel start -> a
     com.android.tools.r8.cf.code.CfLabel end -> b
     java.util.List targets -> d
@@ -44179,7 +44179,7 @@ com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.internal.kF0:
     1:1:com.android.tools.r8.cf.code.CfLabel lambda$acceptCompareTo$1(com.android.tools.r8.cf.code.CfTryCatch):57:57 -> b
     1:1:java.util.Collection lambda$acceptCompareTo$2(com.android.tools.r8.cf.code.CfTryCatch):58:58 -> c
     1:1:java.util.Collection lambda$acceptCompareTo$3(com.android.tools.r8.cf.code.CfTryCatch):59:59 -> d
-com.android.tools.r8.cf.code.CfTypeInstruction -> com.android.tools.r8.internal.lF0:
+com.android.tools.r8.cf.code.CfTypeInstruction -> com.android.tools.r8.internal.oF0:
 com.android.tools.r8.code.AddDouble -> com.android.tools.r8.code.b:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
@@ -44493,8 +44493,8 @@ com.android.tools.r8.code.Base5Format -> com.android.tools.r8.code.J:
     1:1:void <init>():10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.code.BytecodeStream):13:13 -> <init>
     int getSize() -> w
-com.android.tools.r8.code.BytecodeStream -> com.android.tools.r8.internal.KC0:
-com.android.tools.r8.code.CfOrDexInstruction -> com.android.tools.r8.internal.vE0:
+com.android.tools.r8.code.BytecodeStream -> com.android.tools.r8.internal.NC0:
+com.android.tools.r8.code.CfOrDexInstruction -> com.android.tools.r8.internal.yE0:
     com.android.tools.r8.cf.code.CfInstruction asCfInstruction() -> b
 com.android.tools.r8.code.CheckCast -> com.android.tools.r8.code.K:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):25:25 -> <init>
@@ -44937,7 +44937,7 @@ com.android.tools.r8.code.DexItemBasedConstString -> com.android.tools.r8.code.g
     12:12:void registerUse(com.android.tools.r8.graph.UseRegistry):113 -> a
     13:13:void registerUse(com.android.tools.r8.graph.UseRegistry):113:113 -> a
     14:14:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):119:119 -> a
-    15:18:void com.android.tools.r8.ir.conversion.IRBuilder.addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1305:1308 -> a
+    15:18:void com.android.tools.r8.ir.conversion.IRBuilder.addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1321:1324 -> a
     15:18:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):119 -> a
     1:1:com.android.tools.r8.graph.DexReference lambda$internalSubSpecify$0(com.android.tools.r8.code.Format21c):73:73 -> b
     2:2:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):89:89 -> b
@@ -44955,7 +44955,7 @@ com.android.tools.r8.code.DexNewUnboxedEnumInstance -> com.android.tools.r8.code
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):68:68 -> a
     4:4:com.android.tools.r8.graph.DexType getType():77:77 -> a
     4:4:void registerUse(com.android.tools.r8.graph.UseRegistry):73 -> a
-    5:5:void com.android.tools.r8.graph.UseRegistry.registerNewUnboxedEnumInstance(com.android.tools.r8.graph.DexType):59:59 -> a
+    5:5:void com.android.tools.r8.graph.UseRegistry.registerNewUnboxedEnumInstance(com.android.tools.r8.graph.DexType):70:70 -> a
     5:5:void registerUse(com.android.tools.r8.graph.UseRegistry):73 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):82:82 -> a
     7:7:com.android.tools.r8.graph.DexType getType():77:77 -> a
@@ -46764,7 +46764,7 @@ com.android.tools.r8.code.InvokeCustom -> com.android.tools.r8.code.E1:
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():63:63 -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):68 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):68:68 -> a
-    3:19:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1567:1583 -> a
+    3:19:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1583:1599 -> a
     3:19:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):68 -> a
     20:20:com.android.tools.r8.graph.DexCallSite getCallSite():63:63 -> a
     20:20:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52 -> a
@@ -47316,7 +47316,7 @@ com.android.tools.r8.code.MoveObject -> com.android.tools.r8.code.l2:
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    2:2:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> a
+    2:2:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):46:46 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
@@ -47331,7 +47331,7 @@ com.android.tools.r8.code.MoveObject16 -> com.android.tools.r8.code.k2:
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    2:2:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> a
+    2:2:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40 -> a
     1:1:java.lang.String getName():25:25 -> s
     int getOpcode() -> u
@@ -47341,7 +47341,7 @@ com.android.tools.r8.code.MoveObjectFrom16 -> com.android.tools.r8.code.m2:
     2:2:void <init>(int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    2:2:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1342:1342 -> a
+    2:2:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1358:1358 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39 -> a
     3:3:void com.android.tools.r8.code.Format22x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):47:47 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
@@ -48562,7 +48562,7 @@ com.android.tools.r8.com.google.common.base.Absent -> com.android.tools.r8.inter
     1:1:void <init>():36:36 -> <init>
     java.lang.Object or(java.lang.Object) -> a
     1:1:java.lang.String toString():94:94 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.internal.DF0:
+com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.internal.GF0:
     int $r8$clinit -> a
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.whitespace():134:134 -> <clinit>
     1:1:void <clinit>():272 -> <clinit>
@@ -48588,7 +48588,7 @@ com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.
     2:2:boolean apply(java.lang.Object):53 -> apply
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher negate():497:497 -> b
     1:1:java.util.function.Predicate negate():53:53 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$Any -> com.android.tools.r8.internal.rF0:
+com.android.tools.r8.com.google.common.base.CharMatcher$Any -> com.android.tools.r8.internal.uF0:
     com.android.tools.r8.com.google.common.base.CharMatcher$Any INSTANCE -> c
     1:1:void <clinit>():1119:1119 -> <clinit>
     1:1:void <init>():1122:1122 -> <init>
@@ -48598,27 +48598,27 @@ com.android.tools.r8.com.google.common.base.CharMatcher$Any -> com.android.tools
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.none():117:117 -> negate
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$Any.negate():1209 -> negate
     1:1:java.util.function.Predicate negate():1117 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$Ascii -> com.android.tools.r8.internal.sF0:
+com.android.tools.r8.com.google.common.base.CharMatcher$Ascii -> com.android.tools.r8.internal.vF0:
     com.android.tools.r8.com.google.common.base.CharMatcher$Ascii INSTANCE -> c
     1:1:void <clinit>():1385:1385 -> <clinit>
     1:1:void <init>():1388:1388 -> <init>
     boolean matches(char) -> a
-com.android.tools.r8.com.google.common.base.CharMatcher$Digit -> com.android.tools.r8.internal.tF0:
+com.android.tools.r8.com.google.common.base.CharMatcher$Digit -> com.android.tools.r8.internal.wF0:
     com.android.tools.r8.com.google.common.base.CharMatcher$Digit INSTANCE -> e
     1:1:void <clinit>():1455:1455 -> <clinit>
     1:1:void <init>():1458:1458 -> <init>
     1:3:char[] nines():1448:1450 -> c
     1:1:char[] zeroes():1444:1444 -> d
-com.android.tools.r8.com.google.common.base.CharMatcher$Invisible -> com.android.tools.r8.internal.uF0:
+com.android.tools.r8.com.google.common.base.CharMatcher$Invisible -> com.android.tools.r8.internal.xF0:
     com.android.tools.r8.com.google.common.base.CharMatcher$Invisible INSTANCE -> e
     1:1:void <clinit>():1567:1567 -> <clinit>
     1:1:void <init>():1570:1570 -> <init>
-com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl -> com.android.tools.r8.internal.vF0:
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl -> com.android.tools.r8.internal.yF0:
     com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl INSTANCE -> c
     1:1:void <clinit>():1545:1545 -> <clinit>
     1:1:void <init>():1548:1548 -> <init>
     boolean matches(char) -> a
-com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.internal.wF0:
+com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.internal.zF0:
     java.lang.String description -> b
     1:1:void com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.<init>():1047:1047 -> <init>
     1:1:void <init>(java.lang.String):1065 -> <init>
@@ -48637,7 +48637,7 @@ com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.
     1:1:java.util.function.Predicate com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.negate():0 -> negate
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:java.lang.String toString():1071:1071 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$Negated -> com.android.tools.r8.internal.xF0:
+com.android.tools.r8.com.google.common.base.CharMatcher$Negated -> com.android.tools.r8.internal.AF0:
     com.android.tools.r8.com.google.common.base.CharMatcher original -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.base.CharMatcher):1594:1595 -> <init>
     1:1:boolean matches(char):1600:1600 -> a
@@ -48648,9 +48648,9 @@ com.android.tools.r8.com.google.common.base.CharMatcher$Negated -> com.android.t
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$Negated.negate():1629:1629 -> negate
     1:1:java.util.function.Predicate negate():1590 -> negate
     1:1:java.lang.String toString():1634:1634 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$NegatedFastMatcher -> com.android.tools.r8.internal.yF0:
+com.android.tools.r8.com.google.common.base.CharMatcher$NegatedFastMatcher -> com.android.tools.r8.internal.BF0:
     1:1:void <init>(com.android.tools.r8.com.google.common.base.CharMatcher):1079:1079 -> <init>
-com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.internal.zF0:
+com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.internal.CF0:
     com.android.tools.r8.com.google.common.base.CharMatcher$None INSTANCE -> c
     1:1:void <clinit>():1216:1216 -> <clinit>
     1:1:void <init>():1219:1219 -> <init>
@@ -48660,7 +48660,7 @@ com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tool
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.any():108:108 -> negate
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$None.negate():1312 -> negate
     1:1:java.util.function.Predicate negate():1214 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$RangesMatcher -> com.android.tools.r8.internal.AF0:
+com.android.tools.r8.com.google.common.base.CharMatcher$RangesMatcher -> com.android.tools.r8.internal.DF0:
     char[] rangeStarts -> c
     char[] rangeEnds -> d
     java.lang.String description -> b
@@ -48672,24 +48672,24 @@ com.android.tools.r8.com.google.common.base.CharMatcher$RangesMatcher -> com.and
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.negate():497:497 -> negate
     1:1:java.util.function.Predicate negate():1398 -> negate
     1:1:java.lang.String toString():1430:1430 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$SingleWidth -> com.android.tools.r8.internal.BF0:
+com.android.tools.r8.com.google.common.base.CharMatcher$SingleWidth -> com.android.tools.r8.internal.EF0:
     com.android.tools.r8.com.google.common.base.CharMatcher$SingleWidth INSTANCE -> e
     1:1:void <clinit>():1577:1577 -> <clinit>
     1:2:void <init>():1582:1583 -> <init>
     3:3:void <init>():1580:1580 -> <init>
-com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace -> com.android.tools.r8.internal.CF0:
+com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace -> com.android.tools.r8.internal.FF0:
     com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace INSTANCE -> d
     int SHIFT -> c
     1:3:void <clinit>():1326:1328 -> <clinit>
     1:1:void <init>():1331:1331 -> <init>
     1:1:boolean matches(char):1336:1336 -> a
-com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.internal.LF0:
+com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.internal.OF0:
     java.nio.charset.Charset UTF_8 -> a
     1:50:void <clinit>():45:94 -> <clinit>
-com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.internal.EI0:
+com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.internal.HI0:
     1:1:void <init>():25:25 -> <init>
     com.android.tools.r8.com.google.common.base.CommonMatcher matcher(java.lang.CharSequence) -> a
-com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.internal.kO0:
+com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.internal.nO0:
     1:1:void <init>():41:41 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     int doHash(java.lang.Object) -> a
@@ -48697,8 +48697,8 @@ com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.
     2:2:int hash(java.lang.Object):113:113 -> b
     1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(java.lang.Object):162:162 -> c
     1:1:boolean test(java.lang.Object,java.lang.Object):78:78 -> test
-com.android.tools.r8.com.google.common.base.Equivalence$1 -> com.android.tools.r8.internal.iO0:
-com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.internal.jO0:
+com.android.tools.r8.com.google.common.base.Equivalence$1 -> com.android.tools.r8.internal.lO0:
+com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.internal.mO0:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> a
     java.lang.Object reference -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.base.Equivalence,java.lang.Object,com.android.tools.r8.com.google.common.base.Equivalence$1):183:183 -> <init>
@@ -48709,29 +48709,29 @@ com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.t
     2:2:int com.android.tools.r8.com.google.common.base.Equivalence.hash(java.lang.Object):113:113 -> hashCode
     2:2:int hashCode():229 -> hashCode
     1:1:java.lang.String toString():238:238 -> toString
-com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.internal.wQ0:
-com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.internal.JY0:
+com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.internal.zQ0:
+com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.internal.MY0:
     java.util.regex.Pattern pattern -> a
     1:2:void <init>(java.util.regex.Pattern):29:30 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.CommonMatcher matcher(java.lang.CharSequence):35:35 -> a
     1:4:boolean equals(java.lang.Object):60:63 -> equals
     1:1:int hashCode():55:55 -> hashCode
     1:1:java.lang.String toString():50:50 -> toString
-com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.internal.IY0:
+com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.internal.LY0:
     java.util.regex.Matcher matcher -> a
     1:1:void com.android.tools.r8.com.google.common.base.CommonMatcher.<init>():25:25 -> <init>
     1:1:void <init>(java.util.regex.Matcher):69 -> <init>
     2:2:void <init>(java.util.regex.Matcher):70:70 -> <init>
-com.android.tools.r8.com.google.common.base.MoreObjects -> com.android.tools.r8.internal.z81:
+com.android.tools.r8.com.google.common.base.MoreObjects -> com.android.tools.r8.internal.C81:
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     1:1:java.lang.Object firstNonNull(java.lang.Object,java.lang.Object):56 -> a
-com.android.tools.r8.com.google.common.base.Objects -> com.android.tools.r8.internal.hd1:
+com.android.tools.r8.com.google.common.base.Objects -> com.android.tools.r8.internal.kd1:
     1:1:boolean equal(java.lang.Object,java.lang.Object):52:52 -> a
-com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.internal.vd1:
+com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.internal.yd1:
     1:1:void <init>():150:150 -> <init>
     java.lang.Object or(java.lang.Object) -> a
     1:1:com.android.tools.r8.com.google.common.base.Optional absent():93:93 -> a
-com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.internal.we1:
+com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.internal.ze1:
     com.android.tools.r8.com.google.common.base.PatternCompiler patternCompiler -> b
     java.util.logging.Logger logger -> a
     1:2:void <clinit>():35:36 -> <clinit>
@@ -48746,11 +48746,11 @@ com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.int
     11:11:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):66:66 -> a
     12:12:com.android.tools.r8.com.google.common.base.CommonPattern com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler.compile(java.lang.String):98:98 -> a
     12:12:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):66 -> a
-com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.internal.ue1:
-com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.internal.ve1:
+com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.internal.xe1:
+com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.internal.ye1:
     1:1:void <init>():95:95 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.base.Platform$1):95:95 -> <init>
-com.android.tools.r8.com.google.common.base.Preconditions -> com.android.tools.r8.internal.De1:
+com.android.tools.r8.com.google.common.base.Preconditions -> com.android.tools.r8.internal.Ge1:
     1:1:void checkArgument(boolean):121:121 -> a
     2:2:void checkArgument(boolean,java.lang.Object):135:135 -> a
     3:3:void checkArgument(boolean,java.lang.String,char):170:170 -> a
@@ -48791,9 +48791,9 @@ com.android.tools.r8.com.google.common.base.Preconditions -> com.android.tools.r
     4:4:int checkPositionIndex(int,int):1223:1223 -> b
     5:5:int com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndex(int,int,java.lang.String):1241:1241 -> b
     5:5:int checkPositionIndex(int,int):1223 -> b
-com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.internal.Ee1:
+com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.internal.He1:
     1:1:boolean test(java.lang.Object):80:80 -> test
-com.android.tools.r8.com.google.common.base.Predicates -> com.android.tools.r8.internal.Ne1:
+com.android.tools.r8.com.google.common.base.Predicates -> com.android.tools.r8.internal.Qe1:
     1:1:com.android.tools.r8.com.google.common.base.Predicate alwaysFalse():62:62 -> a
     2:2:com.android.tools.r8.com.google.common.base.Predicate not(com.android.tools.r8.com.google.common.base.Predicate):88:88 -> a
     3:3:com.android.tools.r8.com.google.common.base.Predicate or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156:156 -> a
@@ -48803,27 +48803,27 @@ com.android.tools.r8.com.google.common.base.Predicates -> com.android.tools.r8.i
     6:6:com.android.tools.r8.com.google.common.base.Predicate or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156 -> a
     7:7:com.android.tools.r8.com.google.common.base.Predicate or(com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):156:156 -> a
     1:1:com.android.tools.r8.com.google.common.base.Predicate alwaysTrue():54:54 -> b
-com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.internal.He1:
-com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.internal.Ie1:
+com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.internal.Ke1:
+com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.internal.Le1:
     com.android.tools.r8.com.google.common.base.Predicate predicate -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Predicate):341:342 -> <init>
     1:1:boolean apply(java.lang.Object):347:347 -> apply
     1:3:boolean equals(java.lang.Object):357:359 -> equals
     1:1:int hashCode():352:352 -> hashCode
     1:1:java.lang.String toString():366:366 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.internal.Le1:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.internal.Oe1:
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate ALWAYS_FALSE -> b
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate ALWAYS_TRUE -> a
     1:13:void <clinit>():283:295 -> <clinit>
     1:1:void <init>(java.lang.String,int):281:281 -> <init>
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.base.Predicates$1):281:281 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.internal.Je1:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.internal.Me1:
     1:1:void <init>(java.lang.String,int):283:283 -> <init>
     1:1:java.lang.String toString():291:291 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.internal.Ke1:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.internal.Ne1:
     1:1:void <init>(java.lang.String,int):295:295 -> <init>
     1:1:java.lang.String toString():303:303 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.internal.Me1:
+com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.internal.Pe1:
     java.util.List components -> a
     1:1:void <init>(java.util.List,com.android.tools.r8.com.google.common.base.Predicates$1):415:415 -> <init>
     2:3:void <init>(java.util.List):418:419 -> <init>
@@ -48834,7 +48834,7 @@ com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.androi
     2:11:java.lang.String com.android.tools.r8.com.google.common.base.Predicates.toStringHelper(java.lang.String,java.lang.Iterable):457:466 -> toString
     2:11:java.lang.String com.android.tools.r8.com.google.common.base.Predicates.access$800(java.lang.String,java.lang.Iterable):43 -> toString
     2:11:java.lang.String toString():450 -> toString
-com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.internal.Ln1:
+com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.internal.Dn1:
     1:1:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy,boolean,com.android.tools.r8.com.google.common.base.CharMatcher,int):103:103 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252:252 -> a
     2:2:com.android.tools.r8.com.google.common.base.Splitter com.android.tools.r8.com.google.common.base.Splitter.on(com.android.tools.r8.com.google.common.base.CommonPattern):214:214 -> a
@@ -48854,29 +48854,29 @@ com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.int
     12:12:void com.android.tools.r8.com.google.common.base.Splitter.<init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy):100:100 -> a
     12:12:com.android.tools.r8.com.google.common.base.Splitter com.android.tools.r8.com.google.common.base.Splitter.on(com.android.tools.r8.com.google.common.base.CommonPattern):218 -> a
     12:12:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252 -> a
-com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.internal.Kn1:
+com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.internal.Cn1:
     1:1:void <init>(com.android.tools.r8.com.google.common.base.CommonPattern):219:219 -> <init>
-com.android.tools.r8.com.google.common.base.Strings -> com.android.tools.r8.internal.np1:
+com.android.tools.r8.com.google.common.base.Strings -> com.android.tools.r8.internal.fp1:
     1:20:java.lang.String repeat(java.lang.String,int):146:165 -> a
     21:21:java.lang.String repeat(java.lang.String,int):155:155 -> a
-com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.internal.Ip1:
-com.android.tools.r8.com.google.common.base.Suppliers -> com.android.tools.r8.internal.Mp1:
+com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.internal.Ap1:
+com.android.tools.r8.com.google.common.base.Suppliers -> com.android.tools.r8.internal.Ep1:
     1:5:com.android.tools.r8.com.google.common.base.Supplier memoize(com.android.tools.r8.com.google.common.base.Supplier):97:101 -> a
-com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.internal.Kp1:
+com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.internal.Cp1:
     com.android.tools.r8.com.google.common.base.Supplier delegate -> a
     java.lang.Object value -> c
     boolean initialized -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Supplier):114:115 -> <init>
     1:11:java.lang.Object get():121:131 -> get
     1:1:java.lang.String toString():136:136 -> toString
-com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.internal.Lp1:
+com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.internal.Dp1:
     com.android.tools.r8.com.google.common.base.Supplier delegate -> a
     java.lang.Object value -> c
     boolean initialized -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Supplier):150:151 -> <init>
     1:13:java.lang.Object get():157:169 -> get
     1:1:java.lang.String toString():174:174 -> toString
-com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.internal.sq1:
+com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.internal.kq1:
     java.lang.Object jla -> a
     int $r8$clinit -> b
     1:3:java.lang.Object com.android.tools.r8.com.google.common.base.Throwables.getJLA():482:484 -> <clinit>
@@ -49694,7 +49694,7 @@ com.android.tools.r8.com.google.common.collect.AbstractMultiset$EntrySet -> com.
     1:1:com.android.tools.r8.com.google.common.collect.Multiset multiset():197:197 -> a
     1:1:java.util.Iterator iterator():202:202 -> iterator
     1:1:int size():207:207 -> size
-com.android.tools.r8.com.google.common.collect.ArrayListMultimap -> com.android.tools.r8.internal.Sz0:
+com.android.tools.r8.com.google.common.collect.ArrayListMultimap -> com.android.tools.r8.internal.Vz0:
     int expectedValuesPerKey -> g
     1:1:void <init>():112:112 -> <init>
     2:2:void com.android.tools.r8.com.google.common.collect.ArrayListMultimapGwtSerializationDependencies.<init>(java.util.Map):36:36 -> <init>
@@ -49709,10 +49709,10 @@ com.android.tools.r8.com.google.common.collect.ArrayListMultimap -> com.android.
     1:2:boolean remove(java.lang.Object,java.lang.Object):65 -> remove
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractMultimap.toString():274:274 -> toString
     1:1:java.lang.String toString():65 -> toString
-com.android.tools.r8.com.google.common.collect.BiMap -> com.android.tools.r8.internal.oB0:
+com.android.tools.r8.com.google.common.collect.BiMap -> com.android.tools.r8.internal.rB0:
     java.lang.Object forcePut(java.lang.Object,java.lang.Object) -> a
     com.android.tools.r8.com.google.common.collect.BiMap inverse() -> e
-com.android.tools.r8.com.google.common.collect.ByFunctionOrdering -> com.android.tools.r8.internal.BC0:
+com.android.tools.r8.com.google.common.collect.ByFunctionOrdering -> com.android.tools.r8.internal.EC0:
     com.android.tools.r8.com.google.common.base.Function function -> a
     com.android.tools.r8.com.google.common.collect.Ordering ordering -> b
     1:3:void <init>(com.android.tools.r8.com.google.common.base.Function,com.android.tools.r8.com.google.common.collect.Ordering):36:38 -> <init>
@@ -49722,11 +49722,11 @@ com.android.tools.r8.com.google.common.collect.ByFunctionOrdering -> com.android
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):76:76 -> hashCode
     2:2:int hashCode():60 -> hashCode
     1:1:java.lang.String toString():65:65 -> toString
-com.android.tools.r8.com.google.common.collect.CollectPreconditions -> com.android.tools.r8.internal.lI0:
+com.android.tools.r8.com.google.common.collect.CollectPreconditions -> com.android.tools.r8.internal.oI0:
     1:1:void checkEntryNotNull(java.lang.Object,java.lang.Object):34:34 -> a
     2:2:void checkEntryNotNull(java.lang.Object,java.lang.Object):32:32 -> a
     3:3:int checkNonnegative(int,java.lang.String):41:41 -> a
-com.android.tools.r8.com.google.common.collect.CollectSpliterators -> com.android.tools.r8.internal.qI0:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators -> com.android.tools.r8.internal.tI0:
     1:4:java.util.Spliterator flatMap(java.util.Spliterator,java.util.function.Function,int,long):201:204 -> a
     5:5:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     5:5:java.util.Spliterator flatMap(java.util.Spliterator,java.util.function.Function,int,long):207 -> a
@@ -49738,7 +49738,7 @@ com.android.tools.r8.com.google.common.collect.CollectSpliterators -> com.androi
     9:9:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     9:9:java.util.Spliterator map(java.util.Spliterator,java.util.function.Function):104 -> a
     10:10:java.util.Spliterator map(java.util.Spliterator,java.util.function.Function):105:105 -> a
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.internal.mI0:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.internal.pI0:
     java.util.Spliterator val$fromSpliterator -> a
     java.util.function.Function val$function -> b
     1:1:void <init>(java.util.Spliterator,java.util.function.Function):105:105 -> <init>
@@ -49754,7 +49754,7 @@ com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.andr
     3:3:java.util.Spliterator trySplit():121 -> trySplit
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.map(java.util.Spliterator,java.util.function.Function):105:105 -> trySplit
     4:4:java.util.Spliterator trySplit():121 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1FlatMapSpliterator -> com.android.tools.r8.internal.nI0:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1FlatMapSpliterator -> com.android.tools.r8.internal.qI0:
     long estimatedSize -> d
     java.util.function.Function val$function -> e
     java.util.Spliterator from -> b
@@ -49768,7 +49768,7 @@ com.android.tools.r8.com.google.common.collect.CollectSpliterators$1FlatMapSplit
     1:6:void forEachRemaining(java.util.function.Consumer):242:247 -> forEachRemaining
     1:9:boolean tryAdvance(java.util.function.Consumer):226:234 -> tryAdvance
     1:16:java.util.Spliterator trySplit():252:267 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.internal.oI0:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.internal.rI0:
     java.util.function.Predicate val$predicate -> c
     java.lang.Object holder -> a
     java.util.Spliterator val$fromSpliterator -> b
@@ -49784,7 +49784,7 @@ com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> co
     3:3:java.util.Spliterator trySplit():167 -> trySplit
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.filter(java.util.Spliterator,java.util.function.Predicate):189:189 -> trySplit
     4:4:java.util.Spliterator trySplit():167 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.internal.pI0:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.internal.sI0:
     java.util.Comparator val$comparator -> c
     java.util.Spliterator delegate -> a
     int val$extraCharacteristics -> b
@@ -49795,14 +49795,14 @@ com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacte
     1:4:java.util.Comparator getComparator():87:90 -> getComparator
     1:1:boolean tryAdvance(java.util.function.Consumer):60:60 -> tryAdvance
     1:2:java.util.Spliterator trySplit():71:72 -> trySplit
-com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> com.android.tools.r8.internal.FI0:
+com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> com.android.tools.r8.internal.II0:
     java.util.Comparator comparator -> a
     1:2:void <init>(java.util.Comparator):31:32 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):37:37 -> compare
     1:3:boolean equals(java.lang.Object):45:47 -> equals
     1:1:int hashCode():54:54 -> hashCode
     1:1:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.internal.NJ0:
+com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.internal.QJ0:
     int value -> a
     1:2:void <init>(int):30:31 -> <init>
     1:1:int get():35:35 -> a
@@ -49813,11 +49813,11 @@ com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.int
     1:1:boolean equals(java.lang.Object):63:63 -> equals
     1:1:int hashCode():58:58 -> hashCode
     1:1:java.lang.String toString():68:68 -> toString
-com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap -> com.android.tools.r8.internal.bN0:
+com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap -> com.android.tools.r8.internal.eN0:
     com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap INSTANCE -> g
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():31:31 -> <init>
-com.android.tools.r8.com.google.common.collect.FluentIterable -> com.android.tools.r8.internal.JP0:
+com.android.tools.r8.com.google.common.collect.FluentIterable -> com.android.tools.r8.internal.MP0:
     com.android.tools.r8.com.google.common.base.Optional iterableDelegate -> a
     1:2:void <init>():117:118 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.FluentIterable concat(java.lang.Iterable,java.lang.Iterable):190:190 -> a
@@ -49835,18 +49835,18 @@ com.android.tools.r8.com.google.common.collect.FluentIterable -> com.android.too
     3:12:java.lang.String com.android.tools.r8.com.google.common.collect.Iterators.toString(java.util.Iterator):293:302 -> toString
     3:12:java.lang.String com.android.tools.r8.com.google.common.collect.Iterables.toString(java.lang.Iterable):253 -> toString
     3:12:java.lang.String toString():336 -> toString
-com.android.tools.r8.com.google.common.collect.FluentIterable$2 -> com.android.tools.r8.internal.HP0:
+com.android.tools.r8.com.google.common.collect.FluentIterable$2 -> com.android.tools.r8.internal.KP0:
     java.lang.Iterable[] val$inputs -> b
     1:1:void <init>(java.lang.Iterable[]):261:261 -> <init>
     1:1:java.util.Iterator iterator():264:264 -> iterator
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):578:578 -> iterator
     2:2:java.util.Iterator iterator():264 -> iterator
-com.android.tools.r8.com.google.common.collect.FluentIterable$2$1 -> com.android.tools.r8.internal.GP0:
+com.android.tools.r8.com.google.common.collect.FluentIterable$2$1 -> com.android.tools.r8.internal.JP0:
     com.android.tools.r8.com.google.common.collect.FluentIterable$2 this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.FluentIterable$2,int):266:266 -> <init>
     1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.FluentIterable$2$1.get(int):269:269 -> a
     1:1:java.lang.Object get(int):266 -> a
-com.android.tools.r8.com.google.common.collect.FluentIterable$3 -> com.android.tools.r8.internal.IP0:
+com.android.tools.r8.com.google.common.collect.FluentIterable$3 -> com.android.tools.r8.internal.LP0:
     java.lang.Iterable val$inputs -> b
     1:1:void <init>(java.lang.Iterable):294:294 -> <init>
     1:1:java.util.Iterator iterator():297:297 -> iterator
@@ -49856,7 +49856,7 @@ com.android.tools.r8.com.google.common.collect.FluentIterable$3 -> com.android.t
     3:3:java.util.Iterator iterator():297 -> iterator
     4:4:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):578:578 -> iterator
     4:4:java.util.Iterator iterator():297 -> iterator
-com.android.tools.r8.com.google.common.collect.ForwardingCollection -> com.android.tools.r8.internal.SP0:
+com.android.tools.r8.com.google.common.collect.ForwardingCollection -> com.android.tools.r8.internal.VP0:
     1:1:void com.android.tools.r8.com.google.common.collect.ForwardingObject.<init>():55:55 -> <init>
     1:1:void <init>():55 -> <init>
     java.lang.Object com.android.tools.r8.com.google.common.collect.ForwardingObject.delegate() -> a
@@ -49877,7 +49877,7 @@ com.android.tools.r8.com.google.common.collect.ForwardingCollection -> com.andro
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.ForwardingObject.toString():72:72 -> toString
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.ForwardingObject.toString():0 -> toString
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.google.common.collect.ForwardingSortedSet -> com.android.tools.r8.internal.TP0:
+com.android.tools.r8.com.google.common.collect.ForwardingSortedSet -> com.android.tools.r8.internal.WP0:
     1:1:void com.android.tools.r8.com.google.common.collect.ForwardingSet.<init>():55:55 -> <init>
     1:1:void <init>():62 -> <init>
     java.util.Set com.android.tools.r8.com.google.common.collect.ForwardingSet.delegate() -> c
@@ -49894,7 +49894,7 @@ com.android.tools.r8.com.google.common.collect.ForwardingSortedSet -> com.androi
     1:1:java.lang.Object last():84:84 -> last
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):89:89 -> subSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):94:94 -> tailSet
-com.android.tools.r8.com.google.common.collect.HashBiMap -> com.android.tools.r8.internal.lR0:
+com.android.tools.r8.com.google.common.collect.HashBiMap -> com.android.tools.r8.internal.oR0:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry firstInKeyInsertionOrder -> c
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry lastInKeyInsertionOrder -> d
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] hashTableVToK -> b
@@ -49975,19 +49975,19 @@ com.android.tools.r8.com.google.common.collect.HashBiMap -> com.android.tools.r8
     1:1:java.util.Set com.android.tools.r8.com.google.common.collect.HashBiMap.values():469:469 -> values
     1:1:java.util.Collection values():57 -> values
     2:2:java.util.Set values():469:469 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.internal.bR0:
+com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.internal.eR0:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):474:474 -> <init>
     1:1:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.HashBiMap$1.output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):477:477 -> a
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):474 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$1$MapEntry -> com.android.tools.r8.internal.aR0:
+com.android.tools.r8.com.google.common.collect.HashBiMap$1$MapEntry -> com.android.tools.r8.internal.dR0:
     com.android.tools.r8.com.google.common.collect.HashBiMap$1 this$1 -> b
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry delegate -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$1,com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):483:484 -> <init>
     1:1:java.lang.Object getKey():489:489 -> getKey
     1:1:java.lang.Object getValue():494:494 -> getValue
     1:17:java.lang.Object setValue(java.lang.Object):499:515 -> setValue
-com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry -> com.android.tools.r8.internal.cR0:
+com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry -> com.android.tools.r8.internal.fR0:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry nextInKToVBucket -> e
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry nextInVToKBucket -> f
     int valueHash -> d
@@ -49995,7 +49995,7 @@ com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry -> com.android.
     int keyHash -> c
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry prevInKeyInsertionOrder -> h
     1:3:void <init>(java.lang.Object,int,java.lang.Object,int):99:101 -> <init>
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse -> com.android.tools.r8.internal.hR0:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse -> com.android.tools.r8.internal.kR0:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):550:550 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap,com.android.tools.r8.com.google.common.collect.HashBiMap$1):550:550 -> <init>
@@ -50039,27 +50039,27 @@ com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse -> com.android.
     3:3:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse.forward():553:553 -> values
     3:3:java.util.Set values():640 -> values
     4:4:java.util.Set values():640:640 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.internal.eR0:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.internal.hR0:
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse this$1 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse):645:645 -> <init>
     1:1:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1.output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):648:648 -> a
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):645 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1$InverseEntry -> com.android.tools.r8.internal.dR0:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1$InverseEntry -> com.android.tools.r8.internal.gR0:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry delegate -> a
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 this$2 -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1,com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):654:655 -> <init>
     1:1:java.lang.Object getKey():660:660 -> getKey
     1:1:java.lang.Object getValue():665:665 -> getValue
     1:12:java.lang.Object setValue(java.lang.Object):670:681 -> setValue
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet -> com.android.tools.r8.internal.gR0:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet -> com.android.tools.r8.internal.jR0:
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse this$1 -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse):612:613 -> <init>
     1:1:java.util.Iterator iterator():629:629 -> iterator
     1:5:boolean remove(java.lang.Object):618:622 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet$1 -> com.android.tools.r8.internal.fR0:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet$1 -> com.android.tools.r8.internal.iR0:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet):629:629 -> <init>
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):632:632 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$Itr -> com.android.tools.r8.internal.iR0:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Itr -> com.android.tools.r8.internal.lR0:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry next -> a
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> d
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry toRemove -> b
@@ -50075,15 +50075,15 @@ com.android.tools.r8.com.google.common.collect.HashBiMap$Itr -> com.android.tool
     5:5:void remove():423 -> remove
     6:8:void remove():424:426 -> remove
     9:9:void remove():421:421 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.internal.kR0:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.internal.nR0:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):439:440 -> <init>
     1:1:java.util.Iterator iterator():445:445 -> iterator
     1:7:boolean remove(java.lang.Object):455:461 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet$1 -> com.android.tools.r8.internal.jR0:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet$1 -> com.android.tools.r8.internal.mR0:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet):445:445 -> <init>
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):448:448 -> a
-com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.internal.sR0:
+com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.internal.vR0:
     1:1:void <init>():70:70 -> <init>
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.add(java.lang.Object):84:84 -> add
     1:1:boolean add(java.lang.Object):33 -> add
@@ -50102,18 +50102,18 @@ com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools
     1:1:boolean remove(java.lang.Object):33 -> remove
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractMultiset.toString():248:248 -> toString
     1:1:java.lang.String toString():33 -> toString
-com.android.tools.r8.com.google.common.collect.Hashing -> com.android.tools.r8.internal.wR0:
+com.android.tools.r8.com.google.common.collect.Hashing -> com.android.tools.r8.internal.zR0:
     1:1:int smear(int):50:50 -> a
     2:2:int smearedHash(java.lang.Object):54:54 -> a
     3:4:int closedTableSize(int,double):62:63 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableAsList -> com.android.tools.r8.internal.pS0:
+com.android.tools.r8.com.google.common.collect.ImmutableAsList -> com.android.tools.r8.internal.sS0:
     1:1:void <init>():34:34 -> <init>
     1:1:boolean isPartialView():56:56 -> b
     1:1:boolean contains(java.lang.Object):41:41 -> contains
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection() -> g
     1:1:boolean isEmpty():51:51 -> isEmpty
     1:1:int size():46:46 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.internal.rS0:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.internal.uS0:
     1:1:void com.android.tools.r8.com.google.common.collect.ImmutableBiMapFauxverideShim.<init>():32:32 -> <init>
     1:1:void <init>():341 -> <init>
     1:1:java.lang.Object forcePut(java.lang.Object,java.lang.Object):376:376 -> a
@@ -50127,7 +50127,7 @@ com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.too
     1:1:java.util.Collection values():36 -> values
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableBiMap.values():358:358 -> values
     2:2:java.util.Set values():36 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.internal.qS0:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.internal.tS0:
     1:1:void <init>():159:159 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap build():153:153 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder.put(java.lang.Object,java.lang.Object):172:172 -> a
@@ -50144,7 +50144,7 @@ com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.and
     34:34:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():257 -> b
     35:35:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of():66:66 -> b
     35:35:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():255 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.internal.uS0:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.internal.xS0:
     java.lang.Object[] EMPTY_ARRAY -> a
     1:1:void <clinit>():181:181 -> <clinit>
     1:1:void <init>():168:168 -> <init>
@@ -50176,7 +50176,7 @@ com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.androi
     10:15:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Object[],int):60 -> toArray
     10:15:java.lang.Object[] toArray(java.lang.Object[]):200 -> toArray
     16:19:java.lang.Object[] toArray(java.lang.Object[]):201:204 -> toArray
-com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder -> com.android.tools.r8.internal.sS0:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder -> com.android.tools.r8.internal.vS0:
     java.lang.Object[] contents -> a
     int size -> b
     1:4:void <init>(int):459:462 -> <init>
@@ -50189,19 +50189,19 @@ com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBui
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder add(java.lang.Object):480 -> b
     2:3:com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder add(java.lang.Object):481:482 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.internal.tS0:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.internal.wS0:
     1:1:void <init>():370:370 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder add(java.lang.Object) -> a
     1:1:int expandedCapacity(int,int):361:361 -> a
     2:2:int expandedCapacity(int,int):356:356 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.internal.wS0:
+com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.internal.zS0:
     java.lang.Object value -> b
     java.lang.Object key -> a
     1:3:void <init>(java.lang.Object,java.lang.Object):31:33 -> <init>
     1:1:java.lang.Object getKey():39:39 -> getKey
     1:1:java.lang.Object getValue():45:45 -> getValue
     1:1:java.lang.Object setValue(java.lang.Object):50:50 -> setValue
-com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.internal.xS0:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.internal.AS0:
     java.util.EnumMap delegate -> e
     1:1:void com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.<init>():445:445 -> <init>
     1:1:void <init>(java.util.EnumMap):51 -> <init>
@@ -50242,7 +50242,7 @@ com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.t
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.values():445:445 -> values
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.values():0 -> values
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.internal.yS0:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.internal.BS0:
     java.util.EnumSet delegate -> d
     int hashCode -> e
     1:2:void <init>(java.util.EnumSet):58:59 -> <init>
@@ -50263,7 +50263,7 @@ com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.t
     1:1:int size():84:84 -> size
     1:1:java.util.Spliterator spliterator():74:74 -> spliterator
     1:1:java.lang.String toString():132:132 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.internal.GS0:
+com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.internal.JS0:
     int $r8$clinit -> b
     1:1:void <init>():377:377 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableList asList() -> a
@@ -50391,11 +50391,11 @@ com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tool
     2:2:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction):40 -> spliterator
     2:2:java.util.Spliterator spliterator():576 -> spliterator
     1:1:java.util.List subList(int,int):57:57 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.internal.CS0:
+com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.internal.FS0:
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,int,int):393:393 -> <init>
     1:1:java.lang.Object get(int):396:396 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.android.tools.r8.internal.DS0:
+com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.android.tools.r8.internal.GS0:
     1:1:void <init>():739:739 -> <init>
     2:2:void <init>(int):744:744 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder com.android.tools.r8.com.google.common.collect.ImmutableList$Builder.add(java.lang.Object):757:757 -> a
@@ -50404,7 +50404,7 @@ com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.andr
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder addAll(java.lang.Iterable):772:772 -> b
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder add(java.lang.Object[]):787:787 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder add(java.lang.Object):757:757 -> c
-com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.internal.ES0:
+com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.internal.HS0:
     com.android.tools.r8.com.google.common.collect.ImmutableList forwardList -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):604:605 -> <init>
     1:1:boolean isPartialView():657:657 -> b
@@ -50437,7 +50437,7 @@ com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableLis
     2:2:java.util.ListIterator listIterator(int):601 -> listIterator
     1:1:int size():652:652 -> size
     1:1:java.util.List subList(int,int):601:601 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.internal.FS0:
+com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.internal.IS0:
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> e
     int length -> d
     int offset -> c
@@ -50454,14 +50454,14 @@ com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.andr
     2:2:java.util.ListIterator listIterator(int):457 -> listIterator
     1:1:int size():468:468 -> size
     1:1:java.util.List subList(int,int):457:457 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.internal.IS0:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.internal.LS0:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):391:391 -> <init>
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.get(java.lang.Object):405:406 -> get
     1:2:java.util.Collection get(java.lang.Object):52 -> get
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():81:81 -> get
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.get(java.lang.Object):406 -> get
     3:3:java.util.Collection get(java.lang.Object):52 -> get
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.internal.HS0:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.internal.KS0:
     1:1:void <init>():237:237 -> <init>
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.put(java.lang.Object,java.lang.Object):168:169 -> a
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder put(java.lang.Object,java.lang.Object):242 -> a
@@ -50554,7 +50554,7 @@ com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder ->
     44:44:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():296 -> a
     44:44:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap build():328 -> a
     45:45:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap build():328:328 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.internal.MS0:
+com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.internal.PS0:
     com.android.tools.r8.com.google.common.collect.ImmutableCollection values -> c
     java.util.Map$Entry[] EMPTY_ENTRY_ARRAY -> d
     com.android.tools.r8.com.google.common.collect.ImmutableSet keySet -> b
@@ -50638,12 +50638,12 @@ com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools
     4:13:java.lang.String com.android.tools.r8.com.google.common.collect.Maps.toStringImpl(java.util.Map):3815:3824 -> toString
     4:13:java.lang.String toString():851 -> toString
     1:1:java.util.Collection values():60:60 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.internal.JS0:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.internal.MS0:
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator val$entryIterator -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.UnmodifiableIterator):707:707 -> <init>
     1:1:boolean hasNext():710:710 -> hasNext
     1:1:java.lang.Object next():715:715 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.internal.KS0:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.internal.NS0:
     java.util.Map$Entry[] entries -> b
     int size -> c
     java.util.Comparator valueComparator -> a
@@ -50667,28 +50667,28 @@ com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.andro
     39:39:com.android.tools.r8.com.google.common.collect.ImmutableMap build():371 -> a
     40:40:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.of():113:113 -> a
     40:40:com.android.tools.r8.com.google.common.collect.ImmutableMap build():369 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.internal.LS0:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.internal.OS0:
     com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap):463:463 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():471:471 -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():466:466 -> h
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl.iterator():471:471 -> iterator
     1:1:java.util.Iterator iterator():462 -> iterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.internal.PS0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.internal.SS0:
     1:2:void <init>(java.lang.Object,java.lang.Object):48:49 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInKeyBucket() -> b
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInValueBucket() -> c
     boolean isReusable() -> d
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.internal.NS0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.internal.QS0:
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry nextInValueBucket -> d
     1:2:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry):104:105 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInValueBucket():111:111 -> c
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.internal.OS0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.internal.RS0:
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry nextInKeyBucket -> c
     1:2:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry):79:80 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInKeyBucket():86:86 -> b
     boolean isReusable() -> d
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.internal.RS0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.internal.US0:
     1:1:void <init>():77:77 -> <init>
     1:1:boolean isPartialView():98:98 -> b
     1:4:boolean contains(java.lang.Object):88:91 -> contains
@@ -50698,7 +50698,7 @@ com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.andro
     com.android.tools.r8.com.google.common.collect.ImmutableMap map() -> h
     1:1:int hashCode():109:109 -> hashCode
     1:1:int size():83:83 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.internal.QS0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.internal.TS0:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> d
     java.util.Map$Entry[] entries -> e
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map$Entry[]):43:45 -> <init>
@@ -50713,7 +50713,7 @@ com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntry
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet.iterator():55:55 -> iterator
     1:1:java.util.Iterator iterator():39 -> iterator
     1:1:java.util.Spliterator spliterator():60:60 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.internal.SS0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.internal.VS0:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):39:40 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):71:71 -> a
@@ -50728,7 +50728,7 @@ com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android
     1:1:java.util.Iterator iterator():35 -> iterator
     1:1:int size():45:45 -> size
     1:1:java.util.Spliterator spliterator():55:55 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.internal.VS0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.internal.YS0:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):40:41 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$000(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):37:37 -> a
@@ -50746,18 +50746,18 @@ com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android
     1:1:java.util.Iterator iterator():36 -> iterator
     1:1:int size():46:46 -> size
     1:1:java.util.Spliterator spliterator():67:67 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1 -> com.android.tools.r8.internal.TS0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1 -> com.android.tools.r8.internal.WS0:
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryItr -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):51:52 -> <init>
     1:1:boolean hasNext():56:56 -> hasNext
     1:1:java.lang.Object next():61:61 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.internal.US0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.internal.XS0:
     com.android.tools.r8.com.google.common.collect.ImmutableMapValues this$0 -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList val$entryList -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMapValues,com.android.tools.r8.com.google.common.collect.ImmutableList):83:83 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():91:91 -> g
     1:1:java.lang.Object get(int):86:86 -> get
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.internal.aT0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.internal.dT0:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> e
     int size -> f
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):354:356 -> <init>
@@ -50795,7 +50795,7 @@ com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.
     1:1:int size():493:493 -> size
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractMultimap.toString():274:274 -> toString
     1:1:java.lang.String toString():67 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.internal.WS0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.internal.ZS0:
     java.util.Iterator com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Itr.valueIterator -> c
     java.util.Iterator com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Itr.mapIterator -> a
     java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Itr.key -> b
@@ -50829,11 +50829,11 @@ com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.androi
     7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Itr.next():589 -> next
     7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Itr.next():0 -> next
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder -> com.android.tools.r8.internal.XS0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder -> com.android.tools.r8.internal.aT0:
     com.android.tools.r8.com.google.common.collect.Multimap builderMultimap -> a
     1:1:void <init>():156:156 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.collect.Multimap):159:160 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.internal.YS0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.internal.bT0:
     com.android.tools.r8.com.google.common.collect.ImmutableMultimap multimap -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):539:540 -> <init>
     1:1:boolean isPartialView():550:550 -> b
@@ -50846,7 +50846,7 @@ com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection
     1:1:int size():555:555 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size():493:493 -> size
     2:2:int size():555 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.internal.ZS0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.internal.cT0:
     com.android.tools.r8.com.google.common.collect.ImmutableMultimap this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):642:642 -> <init>
     boolean isPartialView() -> b
@@ -50868,7 +50868,7 @@ com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.and
     1:1:int size():661:661 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size():493:493 -> size
     2:2:int size():661 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.internal.eT0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.internal.hT0:
     int $r8$clinit -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> b
     com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet -> c
@@ -50900,14 +50900,14 @@ com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.
     com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int) -> g
     1:1:int hashCode():345:345 -> hashCode
     1:1:java.lang.String toString():350:350 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.internal.bT0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.internal.eT0:
     java.util.Iterator val$entryIterator -> c
     java.lang.Object element -> b
     int remaining -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset,java.util.Iterator):240:240 -> <init>
     1:1:boolean hasNext():246:246 -> hasNext
     1:7:java.lang.Object next():251:257 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder -> com.android.tools.r8.internal.cT0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder -> com.android.tools.r8.internal.fT0:
     com.android.tools.r8.com.google.common.collect.Multiset contents -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multiset):499:500 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder.add(java.lang.Object):513:513 -> a
@@ -50934,7 +50934,7 @@ com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder -> com.
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder add(java.lang.Object):513 -> b
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder add(java.lang.Object):513:513 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.internal.dT0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.internal.gT0:
     com.android.tools.r8.com.google.common.collect.ImmutableMultiset this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset):373:373 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset,com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1):373:373 -> <init>
@@ -50944,7 +50944,7 @@ com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com
     1:1:java.lang.Object get(int):372 -> get
     1:1:int hashCode():404:404 -> hashCode
     1:1:int size():386:386 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.internal.iT0:
+com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.internal.lT0:
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> b
     int $r8$clinit -> c
     1:1:void <init>():332:332 -> <init>
@@ -50976,7 +50976,7 @@ com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet of():74:74 -> g
     2:10:int chooseTableSize(int):229:237 -> g
     1:1:int hashCode():354:354 -> hashCode
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.internal.fT0:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.internal.iT0:
     1:1:void <init>():471:471 -> <init>
     2:2:void <init>(int):475:475 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder.add(java.lang.Object):490:490 -> a
@@ -50985,7 +50985,7 @@ com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.andro
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder add(java.lang.Object[]):506:506 -> b
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder addAll(java.lang.Iterable):522:522 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder add(java.lang.Object):490:490 -> c
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.internal.hT0:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.internal.kT0:
     1:1:void <init>():376:376 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():381:381 -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():400:400 -> e
@@ -50996,13 +50996,13 @@ com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.andro
     2:2:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction,java.util.Comparator):94:94 -> spliterator
     2:2:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction):40 -> spliterator
     2:2:java.util.Spliterator spliterator():386 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.internal.gT0:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.internal.jT0:
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed):400:400 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1.delegateCollection():408:408 -> g
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():400 -> g
     1:1:java.lang.Object get(int):403:403 -> get
-com.android.tools.r8.com.google.common.collect.Iterables -> com.android.tools.r8.internal.oY0:
+com.android.tools.r8.com.google.common.collect.Iterables -> com.android.tools.r8.internal.rY0:
     1:2:boolean contains(java.lang.Iterable,java.lang.Object):138:139 -> a
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     3:3:boolean com.android.tools.r8.com.google.common.collect.Collections2.safeContains(java.util.Collection,java.lang.Object):107 -> a
@@ -51056,12 +51056,12 @@ com.android.tools.r8.com.google.common.collect.Iterables -> com.android.tools.r8
     1:3:int size(java.lang.Iterable):126:128 -> d
     4:8:int com.android.tools.r8.com.google.common.collect.Iterators.size(java.util.Iterator):168:172 -> d
     4:8:int size(java.lang.Iterable):128 -> d
-com.android.tools.r8.com.google.common.collect.Iterables$10 -> com.android.tools.r8.internal.jY0:
+com.android.tools.r8.com.google.common.collect.Iterables$10 -> com.android.tools.r8.internal.mY0:
     1:1:void <init>():1061:1061 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):1061:1061 -> apply
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterables$10.apply(java.lang.Iterable):1064:1064 -> apply
     2:2:java.lang.Object apply(java.lang.Object):1061 -> apply
-com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.internal.kY0:
+com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.internal.nY0:
     com.android.tools.r8.com.google.common.base.Predicate val$retainIfTrue -> c
     java.lang.Iterable val$unfiltered -> b
     1:1:void <init>(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):575:575 -> <init>
@@ -51087,7 +51087,7 @@ com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.
     3:3:java.util.Spliterator spliterator():594 -> spliterator
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.filter(java.util.Spliterator,java.util.function.Predicate):189:189 -> spliterator
     4:4:java.util.Spliterator spliterator():594 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterables$5 -> com.android.tools.r8.internal.lY0:
+com.android.tools.r8.com.google.common.collect.Iterables$5 -> com.android.tools.r8.internal.oY0:
     java.lang.Iterable val$fromIterable -> b
     com.android.tools.r8.com.google.common.base.Function val$function -> c
     1:1:void <init>(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):722:722 -> <init>
@@ -51097,7 +51097,7 @@ com.android.tools.r8.com.google.common.collect.Iterables$5 -> com.android.tools.
     2:2:void forEach(java.util.function.Consumer):731:731 -> forEach
     1:1:java.util.Iterator iterator():725:725 -> iterator
     1:1:java.util.Spliterator spliterator():736:736 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterables$6 -> com.android.tools.r8.internal.nY0:
+com.android.tools.r8.com.google.common.collect.Iterables$6 -> com.android.tools.r8.internal.qY0:
     java.lang.Iterable val$iterable -> b
     int val$numberToSkip -> c
     1:1:void <init>(java.lang.Iterable,int):889:889 -> <init>
@@ -51109,7 +51109,7 @@ com.android.tools.r8.com.google.common.collect.Iterables$6 -> com.android.tools.
     10:14:java.util.Iterator iterator():899 -> iterator
     15:15:java.util.Iterator iterator():906:906 -> iterator
     1:6:java.util.Spliterator spliterator():931:936 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterables$6$1 -> com.android.tools.r8.internal.mY0:
+com.android.tools.r8.com.google.common.collect.Iterables$6$1 -> com.android.tools.r8.internal.pY0:
     java.util.Iterator val$iterator -> b
     boolean atStart -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Iterables$6,java.util.Iterator):906:907 -> <init>
@@ -51119,7 +51119,7 @@ com.android.tools.r8.com.google.common.collect.Iterables$6$1 -> com.android.tool
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):65:65 -> remove
     2:2:void remove():923 -> remove
     3:3:void remove():924:924 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators -> com.android.tools.r8.internal.CY0:
+com.android.tools.r8.com.google.common.collect.Iterators -> com.android.tools.r8.internal.FY0:
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.emptyListIterator():90:90 -> a
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator emptyIterator():78 -> a
     2:9:boolean contains(java.util.Iterator,java.lang.Object):180:187 -> a
@@ -51159,35 +51159,35 @@ com.android.tools.r8.com.google.common.collect.Iterators -> com.android.tools.r8
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator unmodifiableIterator(java.util.Iterator):131 -> b
     2:7:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator unmodifiableIterator(java.util.Iterator):132:137 -> b
-com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.internal.sY0:
+com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.internal.vY0:
     java.util.Iterator val$iterator -> a
     1:1:void <init>(java.util.Iterator):137:137 -> <init>
     1:1:boolean hasNext():140:140 -> hasNext
     1:1:java.lang.Object next():145:145 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.internal.tY0:
+com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.internal.wY0:
     java.util.Iterator iterator -> a
     java.lang.Iterable val$iterable -> b
     1:2:void <init>(java.lang.Iterable):411:412 -> <init>
     1:1:boolean hasNext():425:425 -> hasNext
     1:7:java.lang.Object next():430:436 -> next
     1:1:void remove():441:441 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.internal.uY0:
+com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.internal.xY0:
     java.lang.Object[] val$elements -> b
     int index -> a
     1:2:void <init>(java.lang.Object[]):471:472 -> <init>
     1:1:boolean hasNext():476:476 -> hasNext
     1:6:java.lang.Object next():481:486 -> next
     7:7:java.lang.Object next():482:482 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.internal.vY0:
+com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.internal.yY0:
     java.util.Iterator val$unfiltered -> c
     com.android.tools.r8.com.google.common.base.Predicate val$retainIfTrue -> d
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):659:659 -> <init>
     1:7:java.lang.Object computeNext():662:668 -> l
-com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.internal.wY0:
+com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.internal.zY0:
     com.android.tools.r8.com.google.common.base.Function val$function -> b
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):817:817 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):820:820 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.internal.xY0:
+com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.internal.AY0:
     java.util.Iterator val$iterator -> c
     int val$limitSize -> b
     int count -> a
@@ -51196,21 +51196,21 @@ com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.
     1:5:java.lang.Object next():962:966 -> next
     6:6:java.lang.Object next():963:963 -> next
     1:1:void remove():971:971 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.internal.yY0:
+com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.internal.BY0:
     java.lang.Object val$value -> b
     boolean done -> a
     1:1:void <init>(java.lang.Object):1104:1104 -> <init>
     1:1:boolean hasNext():1109:1109 -> hasNext
     1:5:java.lang.Object next():1114:1118 -> next
     6:6:java.lang.Object next():1115:1115 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.internal.zY0:
+com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.internal.CY0:
     java.lang.Object[] array -> c
     com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator EMPTY -> e
     int offset -> d
     1:1:void <clinit>():1058:1058 -> <clinit>
     1:3:void <init>(java.lang.Object[],int,int,int):1065:1067 -> <init>
     1:1:java.lang.Object get(int):1072:1072 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.internal.AY0:
+com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.internal.DY0:
     java.util.Deque metaIterators -> d
     java.util.Iterator topMetaIterator -> c
     java.util.Iterator iterator -> b
@@ -51230,14 +51230,14 @@ com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator ->
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):65:65 -> remove
     2:2:void remove():1433 -> remove
     3:4:void remove():1434:1435 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.internal.BY0:
+com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.internal.EY0:
     com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator INSTANCE -> a
     1:1:void <clinit>():98:98 -> <clinit>
     1:1:void <init>(java.lang.String,int):97:97 -> <init>
     1:1:java.lang.Object next():107:107 -> next
     1:1:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):65:65 -> remove
     1:1:void remove():112 -> remove
-com.android.tools.r8.com.google.common.collect.LinkedHashMultiset -> com.android.tools.r8.internal.Y41:
+com.android.tools.r8.com.google.common.collect.LinkedHashMultiset -> com.android.tools.r8.internal.b51:
     1:1:void <init>():80:80 -> <init>
     2:2:void <init>(int):84:84 -> <init>
     1:2:int com.android.tools.r8.com.google.common.collect.Multisets.inferDistinctElements(java.lang.Iterable):402:403 -> a
@@ -51262,8 +51262,8 @@ com.android.tools.r8.com.google.common.collect.LinkedHashMultiset -> com.android
     1:1:boolean remove(java.lang.Object):42 -> remove
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractMultiset.toString():248:248 -> toString
     1:1:java.lang.String toString():42 -> toString
-com.android.tools.r8.com.google.common.collect.ListMultimap -> com.android.tools.r8.internal.h51:
-com.android.tools.r8.com.google.common.collect.Lists -> com.android.tools.r8.internal.n51:
+com.android.tools.r8.com.google.common.collect.ListMultimap -> com.android.tools.r8.internal.k51:
+com.android.tools.r8.com.google.common.collect.Lists -> com.android.tools.r8.internal.q51:
     1:1:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList():88:88 -> a
     1:1:java.util.ArrayList newArrayList(java.util.Iterator):164 -> a
     2:2:java.util.ArrayList newArrayList(java.util.Iterator):165:165 -> a
@@ -51283,9 +51283,9 @@ com.android.tools.r8.com.google.common.collect.Lists -> com.android.tools.r8.int
     24:41:boolean equalsImpl(java.util.List,java.lang.Object):1017:1034 -> a
     42:52:boolean com.android.tools.r8.com.google.common.collect.Iterators.elementsEqual(java.util.Iterator,java.util.Iterator):274:284 -> a
     42:52:boolean equalsImpl(java.util.List,java.lang.Object):1034 -> a
-com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.internal.k51:
+com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.internal.n51:
     1:1:void <init>(java.util.List):991:991 -> <init>
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.internal.m51:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.internal.p51:
     java.util.List forwardList -> a
     1:2:void <init>(java.util.List):854:855 -> <init>
     1:1:java.util.List getForwardList():859:859 -> a
@@ -51346,7 +51346,7 @@ com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.
     7:7:int com.android.tools.r8.com.google.common.collect.Lists$ReverseList.reversePosition(int):870:870 -> subList
     7:7:java.util.List subList(int,int):912 -> subList
     8:8:java.util.List subList(int,int):912:912 -> subList
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.internal.l51:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.internal.o51:
     com.android.tools.r8.com.google.common.collect.Lists$ReverseList this$0 -> c
     java.util.ListIterator val$forwardIterator -> b
     boolean canRemoveOrSet -> a
@@ -51369,7 +51369,7 @@ com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.androi
     2:2:void remove():975 -> remove
     3:4:void remove():976:977 -> remove
     1:2:void set(java.lang.Object):982:983 -> set
-com.android.tools.r8.com.google.common.collect.Maps -> com.android.tools.r8.internal.F61:
+com.android.tools.r8.com.google.common.collect.Maps -> com.android.tools.r8.internal.I61:
     1:1:java.util.HashMap newHashMap():283:283 -> a
     2:2:int capacity(int):309:309 -> a
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
@@ -51378,13 +51378,13 @@ com.android.tools.r8.com.google.common.collect.Maps -> com.android.tools.r8.inte
     1:1:java.util.HashMap newHashMapWithExpectedSize(int):300:300 -> b
     2:2:java.util.IdentityHashMap newIdentityHashMap():511:511 -> b
     1:1:java.util.LinkedHashMap newLinkedHashMapWithExpectedSize(int):377:377 -> c
-com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.internal.u61:
-com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.internal.v61:
+com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.internal.x61:
+com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.internal.y61:
     java.util.Map$Entry val$entry -> a
     1:1:void <init>(java.util.Map$Entry):1447:1447 -> <init>
     1:1:java.lang.Object getKey():1450:1450 -> getKey
     1:1:java.lang.Object getValue():1455:1455 -> getValue
-com.android.tools.r8.com.google.common.collect.Maps$6 -> com.android.tools.r8.internal.w61:
+com.android.tools.r8.com.google.common.collect.Maps$6 -> com.android.tools.r8.internal.z61:
     java.util.Iterator val$entryIterator -> a
     1:1:void <init>(java.util.Iterator):1462:1462 -> <init>
     1:1:boolean hasNext():1465:1465 -> hasNext
@@ -51397,23 +51397,23 @@ com.android.tools.r8.com.google.common.collect.Maps$6 -> com.android.tools.r8.in
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntry(java.util.Map$Entry):1447:1447 -> next
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps$6.next():1470 -> next
     3:3:java.lang.Object next():1462 -> next
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.internal.z61:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.internal.C61:
     com.android.tools.r8.com.google.common.collect.Maps$EntryFunction VALUE -> b
     com.android.tools.r8.com.google.common.collect.Maps$EntryFunction KEY -> a
     1:8:void <clinit>():93:100 -> <clinit>
     1:1:void <init>(java.lang.String,int):92:92 -> <init>
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.collect.Maps$1):92:92 -> <init>
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.internal.x61:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.internal.A61:
     1:1:void <init>(java.lang.String,int):93:93 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):93:93 -> apply
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1.apply(java.util.Map$Entry):97:97 -> apply
     2:2:java.lang.Object apply(java.lang.Object):93 -> apply
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.internal.y61:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.internal.B61:
     1:1:void <init>(java.lang.String,int):100:100 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):100:100 -> apply
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2.apply(java.util.Map$Entry):104:104 -> apply
     2:2:java.lang.Object apply(java.lang.Object):100 -> apply
-com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.internal.A61:
+com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.internal.D61:
     1:1:void <init>():4112:4112 -> <init>
     java.util.Map map() -> a
     1:1:void clear():4122:4122 -> clear
@@ -51432,11 +51432,11 @@ com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tool
     6:6:boolean retainAll(java.util.Collection):4166 -> retainAll
     7:13:boolean retainAll(java.util.Collection):4167:4173 -> retainAll
     1:1:int size():4117:4117 -> size
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.internal.C61:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.internal.F61:
     1:1:void <init>():3653:3653 -> <init>
     java.util.Iterator entryIterator() -> b
     1:1:java.util.Set entrySet():3666:3666 -> entrySet
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.internal.B61:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.internal.E61:
     com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap):3666:3666 -> <init>
     1:1:java.util.Map map():3669:3669 -> a
@@ -51449,7 +51449,7 @@ com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -
     2:2:java.util.Spliterator spliterator():3679 -> spliterator
     3:3:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap.entrySpliterator():3660:3660 -> spliterator
     3:3:java.util.Spliterator spliterator():3679 -> spliterator
-com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.internal.D61:
+com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.internal.G61:
     java.util.Map map -> a
     1:2:void <init>(java.util.Map):3839:3840 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):3856:3856 -> a
@@ -51484,7 +51484,7 @@ com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.Maps$KeySet.map():3844:3844 -> size
     1:1:int size():3861 -> size
     2:2:int size():3861:3861 -> size
-com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.internal.E61:
+com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.internal.H61:
     java.util.Map map -> a
     1:2:void <init>(java.util.Map):4026:4027 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):4043:4043 -> a
@@ -51540,31 +51540,31 @@ com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.Maps$Values.map():4031:4031 -> size
     1:1:int size():4093 -> size
     2:2:int size():4093:4093 -> size
-com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.internal.J81:
+com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.internal.M81:
     boolean containsEntry(java.lang.Object,java.lang.Object) -> a
     java.util.Collection entries() -> a
     java.util.Map asMap() -> b
     com.android.tools.r8.com.google.common.collect.Multiset keys() -> c
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$2 -> com.android.tools.r8.internal.K81:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$2 -> com.android.tools.r8.internal.N81:
     int val$expectedKeys -> a
     1:1:void <init>(int):127:127 -> <init>
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier -> com.android.tools.r8.internal.L81:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier -> com.android.tools.r8.internal.O81:
     int expectedValuesPerKey -> a
     1:2:void <init>(int):193:194 -> <init>
     1:1:java.util.List com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier.get():199:199 -> get
     1:1:java.lang.Object get():190 -> get
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder -> com.android.tools.r8.internal.M81:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder -> com.android.tools.r8.internal.P81:
     1:1:void com.android.tools.r8.com.google.common.collect.MultimapBuilder.<init>():77:77 -> <init>
     1:1:void com.android.tools.r8.com.google.common.collect.MultimapBuilder.<init>(com.android.tools.r8.com.google.common.collect.MultimapBuilder$1):71 -> <init>
     1:1:void <init>():438 -> <init>
     com.android.tools.r8.com.google.common.collect.ListMultimap build() -> a
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys com.android.tools.r8.com.google.common.collect.MultimapBuilder.linkedHashKeys(int):126:127 -> b
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys com.android.tools.r8.com.google.common.collect.MultimapBuilder.linkedHashKeys():113 -> b
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys -> com.android.tools.r8.internal.O81:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys -> com.android.tools.r8.internal.R81:
     1:1:void <init>():282:282 -> <init>
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys.arrayListValues(int):300:301 -> a
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder arrayListValues():290 -> a
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys$1 -> com.android.tools.r8.internal.N81:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys$1 -> com.android.tools.r8.internal.Q81:
     com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys this$0 -> b
     int val$expectedValuesPerKey -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys,int):301:301 -> <init>
@@ -51577,12 +51577,12 @@ com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWi
     5:5:com.android.tools.r8.com.google.common.collect.ListMultimap build():305:305 -> a
     6:6:com.android.tools.r8.com.google.common.collect.ListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.newListMultimap(java.util.Map,com.android.tools.r8.com.google.common.base.Supplier):294:294 -> a
     6:6:com.android.tools.r8.com.google.common.collect.ListMultimap build():304 -> a
-com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap -> com.android.tools.r8.internal.P81:
+com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap -> com.android.tools.r8.internal.S81:
     com.android.tools.r8.com.google.common.base.Supplier factory -> g
     1:2:void <init>(java.util.Map,com.android.tools.r8.com.google.common.base.Supplier):301:302 -> <init>
     1:1:java.util.List com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap.createCollection():307:307 -> j
     1:1:java.util.Collection createCollection():297 -> j
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.internal.T81:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.internal.W81:
     com.android.tools.r8.com.google.common.collect.Multimap multimap -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multimap):1645:1646 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.util.Map$Entry):1678:1678 -> a
@@ -51604,17 +51604,17 @@ com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.too
     3:3:java.util.Iterator iterator():1744 -> iterator
     1:1:java.util.Set elementSet():1786:1786 -> m
     1:1:java.util.Spliterator spliterator():1672:1672 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.internal.R81:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.internal.U81:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys,java.util.Iterator):1652:1652 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):1652:1652 -> a
     2:2:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1.transform(java.util.Map$Entry):1655:1655 -> a
     2:2:java.lang.Object transform(java.lang.Object):1652 -> a
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.internal.Q81:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.internal.T81:
     java.util.Map$Entry val$backingEntry -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1,java.util.Map$Entry):1655:1655 -> <init>
     1:1:int getCount():1663:1663 -> a
     1:1:java.lang.Object getElement():1658:1658 -> b
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$KeysEntrySet -> com.android.tools.r8.internal.S81:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$KeysEntrySet -> com.android.tools.r8.internal.V81:
     com.android.tools.r8.com.google.common.collect.Multimaps$Keys this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys):1692:1692 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Multiset multiset():1695:1695 -> a
@@ -51627,7 +51627,7 @@ com.android.tools.r8.com.google.common.collect.Multimaps$Keys$KeysEntrySet -> co
     1:1:int size():1705:1705 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.Multimaps$Keys.distinctElements():1683:1683 -> size
     2:2:int size():1705 -> size
-com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.internal.V81:
+com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.internal.Y81:
     int remove(java.lang.Object,int) -> a
     boolean setCount(java.lang.Object,int,int) -> a
     1:1:void lambda$forEachEntry$0(java.util.function.ObjIntConsumer,com.android.tools.r8.com.google.common.collect.Multiset$Entry):321:321 -> a
@@ -51643,10 +51643,10 @@ com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.
     2:3:void forEach(java.util.function.Consumer):491:492 -> forEach
     java.util.Set elementSet() -> m
     1:1:java.util.Spliterator spliterator():504:504 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.internal.U81:
+com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.internal.X81:
     int getCount() -> a
     java.lang.Object getElement() -> b
-com.android.tools.r8.com.google.common.collect.Multisets -> com.android.tools.r8.internal.b91:
+com.android.tools.r8.com.google.common.collect.Multisets -> com.android.tools.r8.internal.e91:
     1:13:boolean equalsImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object):880:892 -> a
     14:14:java.util.Spliterator lambda$spliteratorImpl$2(com.android.tools.r8.com.google.common.collect.Multiset$Entry):1126:1126 -> a
     15:17:com.android.tools.r8.com.google.common.collect.ImmutableMultiset copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1159:1161 -> a
@@ -51659,37 +51659,37 @@ com.android.tools.r8.com.google.common.collect.Multisets -> com.android.tools.r8
     20:20:com.android.tools.r8.com.google.common.collect.ImmutableMultiset copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1161 -> a
     1:8:java.util.Spliterator spliteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1123:1130 -> b
     9:9:java.util.Spliterator spliteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1124:1124 -> b
-com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.internal.W81:
+com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.internal.Z81:
     1:1:void <init>():833:833 -> <init>
     1:4:boolean equals(java.lang.Object):840:843 -> equals
     1:2:int hashCode():854:855 -> hashCode
     1:3:java.lang.String toString():867:869 -> toString
-com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.internal.X81:
+com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.internal.a91:
     com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount INSTANCE -> a
     1:1:void <clinit>():1165:1165 -> <clinit>
     1:1:void <init>():1164:1164 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1164:1164 -> compare
     2:2:int com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount.compare(com.android.tools.r8.com.google.common.collect.Multiset$Entry,com.android.tools.r8.com.google.common.collect.Multiset$Entry):1168:1168 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1164 -> compare
-com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1 -> com.android.tools.r8.internal.Y81:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1 -> com.android.tools.r8.internal.b91:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multisets$ElementSet,java.util.Iterator):1002:1002 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):1002:1002 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1.transform(com.android.tools.r8.com.google.common.collect.Multiset$Entry):1005:1005 -> a
     2:2:java.lang.Object transform(java.lang.Object):1002 -> a
-com.android.tools.r8.com.google.common.collect.Multisets$EntrySet -> com.android.tools.r8.internal.Z81:
+com.android.tools.r8.com.google.common.collect.Multisets$EntrySet -> com.android.tools.r8.internal.c91:
     1:1:void <init>():1021:1021 -> <init>
     com.android.tools.r8.com.google.common.collect.Multiset multiset() -> a
     1:1:void clear():1061:1061 -> clear
     1:11:boolean contains(java.lang.Object):1026:1036 -> contains
     1:9:boolean remove(java.lang.Object):1045:1053 -> remove
-com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.internal.a91:
+com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.internal.d91:
     java.lang.Object element -> a
     int count -> b
     1:4:void <init>(java.lang.Object,int):258:261 -> <init>
     1:1:int getCount():272:272 -> a
     1:1:java.lang.Object getElement():267:267 -> b
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket() -> c
-com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.internal.r91:
+com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.internal.u91:
     com.android.tools.r8.com.google.common.collect.NaturalOrdering INSTANCE -> a
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():73:73 -> <init>
@@ -51703,16 +51703,16 @@ com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.to
     4:4:int com.android.tools.r8.com.google.common.collect.NaturalOrdering.compare(java.lang.Comparable,java.lang.Comparable):37:37 -> compare
     4:4:int compare(java.lang.Object,java.lang.Object):25 -> compare
     1:1:java.lang.String toString():70:70 -> toString
-com.android.tools.r8.com.google.common.collect.ObjectArrays -> com.android.tools.r8.internal.Ic1:
+com.android.tools.r8.com.google.common.collect.ObjectArrays -> com.android.tools.r8.internal.Lc1:
     1:1:java.lang.Object[] checkElementsNotNull(java.lang.Object[]):219:219 -> a
     2:2:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[],int):225:225 -> a
     2:2:java.lang.Object[] checkElementsNotNull(java.lang.Object[]):219 -> a
     3:3:java.lang.Object checkElementNotNull(java.lang.Object,int):235:235 -> a
-com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.internal.Gd1:
+com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.internal.Jd1:
     1:1:void <init>():390:390 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Ordering natural():161:161 -> a
     2:2:com.android.tools.r8.com.google.common.collect.Ordering from(java.util.Comparator):181:181 -> a
-com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.internal.Dk1:
+com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.internal.Bk1:
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegate -> c
     com.android.tools.r8.com.google.common.collect.ImmutableList delegateList -> d
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableList):35:37 -> <init>
@@ -51723,7 +51723,7 @@ com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.and
     1:1:java.lang.Object get(int):73:73 -> get
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.RegularImmutableAsList.listIterator(int):56:56 -> listIterator
     1:1:java.util.ListIterator listIterator(int):29 -> listIterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.internal.Ik1:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.internal.Gk1:
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> j
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] keyTable -> e
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] valueTable -> f
@@ -51778,8 +51778,8 @@ com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.andr
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():189 -> s
     3:4:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():191:192 -> s
     1:1:int size():179:179 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.internal.Ek1:
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.internal.Hk1:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.internal.Ck1:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.internal.Fk1:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap):195:195 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap,com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1):195:195 -> <init>
@@ -51803,7 +51803,7 @@ com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse ->
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse.inverse():204:204 -> size
     1:1:int size():199 -> size
     2:2:int size():199:199 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.internal.Gk1:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.internal.Ek1:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse this$1 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse):240:240 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():258:258 -> c
@@ -51814,7 +51814,7 @@ com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$Inv
     1:1:int hashCode():253:253 -> hashCode
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet.iterator():258:258 -> iterator
     1:1:java.util.Iterator iterator():239 -> iterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.internal.Fk1:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.internal.Dk1:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet this$2 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet):268:268 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():277:277 -> g
@@ -51823,7 +51823,7 @@ com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$Inv
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1421:1421 -> get
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1.get(int):272 -> get
     3:3:java.lang.Object get(int):268 -> get
-com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.internal.Jk1:
+com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.internal.Hk1:
     java.lang.Object[] array -> c
     com.android.tools.r8.com.google.common.collect.ImmutableList EMPTY -> d
     1:1:void <clinit>():31:31 -> <clinit>
@@ -51836,7 +51836,7 @@ com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.andro
     1:1:java.util.ListIterator listIterator(int):28 -> listIterator
     1:1:int size():42:42 -> size
     1:1:java.util.Spliterator spliterator():73:73 -> spliterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.internal.Mk1:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.internal.Kk1:
     com.android.tools.r8.com.google.common.collect.ImmutableMap EMPTY -> h
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] table -> f
     java.util.Map$Entry[] entries -> e
@@ -51875,7 +51875,7 @@ com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.androi
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():229:229 -> k
     boolean isPartialView() -> m
     1:1:int size():159:159 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.internal.Kk1:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.internal.Ik1:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):181:182 -> <init>
     boolean isPartialView() -> b
@@ -51884,13 +51884,13 @@ com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com
     2:2:boolean contains(java.lang.Object):192 -> contains
     1:1:java.lang.Object get(int):187:187 -> get
     1:1:int size():202:202 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.internal.Lk1:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.internal.Jk1:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):236:237 -> <init>
     boolean isPartialView() -> b
     1:1:java.lang.Object get(int):242:242 -> get
     1:1:int size():247:247 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.internal.Qk1:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.internal.Ok1:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset EMPTY -> j
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] entries -> e
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] hashTable -> f
@@ -51912,8 +51912,8 @@ com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.a
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset.elementSet():140:141 -> m
     1:2:java.util.Set elementSet():34 -> m
     1:1:int size():135:135 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.internal.Nk1:
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.internal.Ok1:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.internal.Lk1:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.internal.Mk1:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset):145:145 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset,com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1):145:145 -> <init>
@@ -51923,11 +51923,11 @@ com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementS
     2:2:boolean contains(java.lang.Object):154 -> contains
     1:1:java.lang.Object get(int):149:149 -> get
     1:1:int size():164:164 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.internal.Pk1:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.internal.Nk1:
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket -> c
     1:2:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry):100:101 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket():106:106 -> c
-com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.internal.Rk1:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.internal.Pk1:
     java.lang.Object[] elements -> d
     com.android.tools.r8.com.google.common.collect.RegularImmutableSet EMPTY -> h
     java.lang.Object[] table -> e
@@ -51951,7 +51951,7 @@ com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.androi
     1:1:java.util.Iterator iterator():30 -> iterator
     1:1:int size():69:69 -> size
     1:1:java.util.Spliterator spliterator():79:79 -> spliterator
-com.android.tools.r8.com.google.common.collect.Sets -> com.android.tools.r8.internal.Om1:
+com.android.tools.r8.com.google.common.collect.Sets -> com.android.tools.r8.internal.Gm1:
     1:1:java.util.HashSet newHashSet(java.lang.Object[]):235:235 -> a
     2:2:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSetWithExpectedSize(int):253:253 -> a
     2:2:java.util.HashSet newHashSet(java.lang.Object[]):235 -> a
@@ -52013,8 +52013,8 @@ com.android.tools.r8.com.google.common.collect.Sets -> com.android.tools.r8.inte
     1:1:java.util.Set newIdentityHashSet():466 -> c
     2:2:java.util.Set newIdentityHashSet():466:466 -> c
     1:1:java.util.LinkedHashSet newLinkedHashSet():347:347 -> d
-com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.internal.Cm1:
-com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.internal.Em1:
+com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.internal.um1:
+com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.internal.wm1:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):842:842 -> <init>
@@ -52026,12 +52026,12 @@ com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.in
     1:1:java.util.stream.Stream parallelStream():868:868 -> parallelStream
     1:2:int size():874:875 -> size
     1:1:java.util.stream.Stream stream():863:863 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.internal.Dm1:
+com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.internal.vm1:
     java.util.Iterator itr -> c
     com.android.tools.r8.com.google.common.collect.Sets$2 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$2):845:846 -> <init>
     1:7:java.lang.Object computeNext():850:856 -> l
-com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.internal.Gm1:
+com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.internal.ym1:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):914:914 -> <init>
@@ -52044,12 +52044,12 @@ com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.in
     1:1:java.util.stream.Stream parallelStream():939:939 -> parallelStream
     1:2:int size():945:946 -> size
     1:1:java.util.stream.Stream stream():934:934 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.internal.Fm1:
+com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.internal.xm1:
     java.util.Iterator itr -> c
     com.android.tools.r8.com.google.common.collect.Sets$3 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$3):917:918 -> <init>
     1:7:java.lang.Object computeNext():921:927 -> l
-com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.internal.Km1:
+com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.internal.Cm1:
     com.android.tools.r8.com.google.common.collect.ImmutableMap val$index -> b
     int val$size -> a
     1:1:void <init>(int,com.android.tools.r8.com.google.common.collect.ImmutableMap):1676:1676 -> <init>
@@ -52057,31 +52057,31 @@ com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.in
     1:1:java.util.Iterator iterator():1688:1688 -> iterator
     1:1:int size():1755:1755 -> size
     1:1:java.lang.String toString():1760:1760 -> toString
-com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.internal.Jm1:
+com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.internal.Bm1:
     java.util.BitSet bits -> c
     com.android.tools.r8.com.google.common.collect.Sets$5 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5):1688:1689 -> <init>
     1:29:java.util.Set com.android.tools.r8.com.google.common.collect.Sets$5$1.computeNext():1693:1721 -> l
     1:29:java.lang.Object computeNext():1688 -> l
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.internal.Im1:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.internal.Am1:
     com.android.tools.r8.com.google.common.collect.Sets$5$1 this$1 -> b
     java.util.BitSet val$copy -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5$1,java.util.BitSet):1721:1721 -> <init>
     1:2:boolean contains(java.lang.Object):1724:1725 -> contains
     1:1:java.util.Iterator iterator():1730:1730 -> iterator
     1:1:int size():1746:1746 -> size
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.internal.Hm1:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.internal.zm1:
     com.android.tools.r8.com.google.common.collect.Sets$5$1$1 this$2 -> d
     int i -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5$1$1):1730:1731 -> <init>
     1:5:java.lang.Object computeNext():1735:1739 -> l
-com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.internal.Lm1:
+com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.internal.Dm1:
     1:1:void <init>():77:77 -> <init>
     1:1:boolean removeAll(java.util.Collection):80:80 -> removeAll
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> retainAll
     1:1:boolean retainAll(java.util.Collection):85 -> retainAll
     2:2:boolean retainAll(java.util.Collection):85:85 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.internal.Mm1:
+com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.internal.Em1:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Sets$1):599:599 -> <init>
     2:2:void <init>():600:600 -> <init>
     1:1:boolean add(java.lang.Object):640:640 -> add
@@ -52091,7 +52091,7 @@ com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools
     1:1:boolean removeAll(java.util.Collection):679:679 -> removeAll
     1:1:boolean removeIf(java.util.function.Predicate):692:692 -> removeIf
     1:1:boolean retainAll(java.util.Collection):705:705 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet -> com.android.tools.r8.internal.Nm1:
+com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet -> com.android.tools.r8.internal.Fm1:
     java.util.SortedSet unmodifiableDelegate -> b
     java.util.NavigableSet delegate -> a
     com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet descendingSet -> c
@@ -52118,7 +52118,7 @@ com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet ->
     1:1:java.util.stream.Stream stream():1847:1847 -> stream
     1:3:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):1910:1910 -> subSet
     1:1:java.util.NavigableSet tailSet(java.lang.Object,boolean):1921:1921 -> tailSet
-com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.internal.rn1:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.internal.jn1:
     java.lang.Object singleValue -> f
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> g
     java.lang.Object singleKey -> e
@@ -52143,7 +52143,7 @@ com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.an
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():90 -> j
     boolean isPartialView() -> m
     1:3:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():100:102 -> s
-com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.internal.sn1:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.internal.kn1:
     java.lang.Object element -> c
     1:2:void <init>(java.lang.Object):37:38 -> <init>
     boolean isPartialView() -> b
@@ -52158,7 +52158,7 @@ com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.and
     1:1:java.util.Spliterator spliterator():54:54 -> spliterator
     1:1:java.util.List subList(int,int):31:31 -> subList
     1:1:java.lang.String toString():70:70 -> toString
-com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.internal.tn1:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.internal.ln1:
     java.lang.Object element -> d
     int cachedHashCode -> e
     1:2:void <init>(java.lang.Object):44:45 -> <init>
@@ -52175,7 +52175,7 @@ com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.andr
     1:1:boolean isHashCodeFast():97:97 -> f
     1:3:int hashCode():88:90 -> hashCode
     1:1:java.lang.String toString():102:102 -> toString
-com.android.tools.r8.com.google.common.collect.Streams -> com.android.tools.r8.internal.Mo1:
+com.android.tools.r8.com.google.common.collect.Streams -> com.android.tools.r8.internal.Eo1:
     java.util.Spliterator lambda$concat$0(java.util.Spliterator) -> a
     1:3:java.util.stream.Stream stream(java.lang.Iterable):62:64 -> a
     4:4:java.util.stream.Stream stream(java.util.Iterator):82:82 -> a
@@ -52199,27 +52199,27 @@ com.android.tools.r8.com.google.common.collect.Streams -> com.android.tools.r8.i
     80:80:java.util.stream.Stream zip(java.util.stream.Stream,java.util.stream.Stream,java.util.function.BiFunction):237 -> a
     81:92:java.util.stream.Stream zip(java.util.stream.Stream,java.util.stream.Stream,java.util.function.BiFunction):238:249 -> a
     93:93:java.util.stream.Stream zip(java.util.stream.Stream,java.util.stream.Stream,java.util.function.BiFunction):247:247 -> a
-com.android.tools.r8.com.google.common.collect.Streams$1 -> com.android.tools.r8.internal.Go1:
+com.android.tools.r8.com.google.common.collect.Streams$1 -> com.android.tools.r8.internal.yo1:
     java.util.function.BiFunction val$function -> c
     java.util.Iterator val$itrB -> b
     java.util.Iterator val$itrA -> a
     1:1:void <init>(long,int,java.util.Iterator,java.util.Iterator,java.util.function.BiFunction):249:249 -> <init>
     1:2:boolean tryAdvance(java.util.function.Consumer):252:253 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.internal.Ho1:
+com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.internal.zo1:
     com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex val$function -> d
     java.lang.Object holder -> c
     1:2:void <init>(java.util.Spliterator,long,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):369:370 -> <init>
     1:1:void accept(java.lang.Object):375:375 -> accept
     1:6:boolean tryAdvance(java.util.function.Consumer):380:385 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.internal.Io1:
+com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.internal.Ao1:
     java.util.Iterator val$fromIterator -> b
     long index -> a
     com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex val$function -> c
     1:2:void <init>(long,int,java.util.Iterator,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):352:353 -> <init>
     1:2:boolean tryAdvance(java.util.function.Consumer):357:358 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.internal.Jo1:
+com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.internal.Bo1:
     java.lang.Object apply(java.lang.Object,long) -> a
-com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.internal.Ko1:
+com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.internal.Co1:
     long index -> b
     java.util.Spliterator fromSpliterator -> a
     1:3:void <init>(java.util.Spliterator,long):419:421 -> <init>
@@ -52233,17 +52233,17 @@ com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -
     6:6:java.util.Spliterator trySplit():413 -> trySplit
     7:7:com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator.trySplit():434:434 -> trySplit
     7:7:java.util.Spliterator trySplit():413 -> trySplit
-com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.internal.dr1:
+com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.internal.Vq1:
     java.util.Iterator backingIterator -> a
     1:2:void <init>(java.util.Iterator):35:36 -> <init>
     java.lang.Object transform(java.lang.Object) -> a
     1:1:boolean hasNext():43:43 -> hasNext
     1:1:java.lang.Object next():48:48 -> next
     1:1:void remove():53:53 -> remove
-com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.internal.es1:
+com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.internal.Wr1:
     1:1:void <init>():35:35 -> <init>
     1:1:void remove():46:46 -> remove
-com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.internal.fs1:
+com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.internal.Xr1:
     1:1:void <init>():33:33 -> <init>
     1:1:void add(java.lang.Object):44:44 -> add
     1:1:void set(java.lang.Object):56:56 -> set
@@ -52260,7 +52260,7 @@ com.android.tools.r8.com.google.common.hash.AbstractHasher -> com.android.tools.
     3:3:com.android.tools.r8.com.google.common.hash.Hasher putFloat(float):42:42 -> a
     4:4:com.android.tools.r8.com.google.common.hash.Hasher putString(java.lang.CharSequence,java.nio.charset.Charset):55:55 -> a
     5:5:com.android.tools.r8.com.google.common.hash.Hasher putBytes(byte[]):60:60 -> a
-com.android.tools.r8.com.google.common.hash.HashCode -> com.android.tools.r8.internal.oR0:
+com.android.tools.r8.com.google.common.hash.HashCode -> com.android.tools.r8.internal.rR0:
     char[] hexDigits -> a
     int $r8$clinit -> b
     1:1:void <clinit>():429:429 -> <clinit>
@@ -52273,7 +52273,7 @@ com.android.tools.r8.com.google.common.hash.HashCode -> com.android.tools.r8.int
     1:3:boolean equals(java.lang.Object):380:382 -> equals
     1:8:int hashCode():396:403 -> hashCode
     1:6:java.lang.String toString():421:426 -> toString
-com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.android.tools.r8.internal.mR0:
+com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.android.tools.r8.internal.pR0:
     byte[] bytes -> c
     1:2:void <init>(byte[]):262:263 -> <init>
     1:1:byte[] asBytes():273:273 -> a
@@ -52281,17 +52281,17 @@ com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.androi
     1:5:int asInt():278:282 -> b
     1:1:int bits():268:268 -> c
     1:1:byte[] getBytesInternal():313:313 -> d
-com.android.tools.r8.com.google.common.hash.HashCode$IntHashCode -> com.android.tools.r8.internal.nR0:
+com.android.tools.r8.com.google.common.hash.HashCode$IntHashCode -> com.android.tools.r8.internal.qR0:
     int hash -> c
     1:2:void <init>(int):125:126 -> <init>
     1:1:byte[] asBytes():136:136 -> a
     2:2:boolean equalsSameBits(com.android.tools.r8.com.google.common.hash.HashCode):168:168 -> a
     1:1:int asInt():146:146 -> b
     int bits() -> c
-com.android.tools.r8.com.google.common.hash.HashFunction -> com.android.tools.r8.internal.rR0:
+com.android.tools.r8.com.google.common.hash.HashFunction -> com.android.tools.r8.internal.uR0:
     com.android.tools.r8.com.google.common.hash.HashCode hashString(java.lang.CharSequence,java.nio.charset.Charset) -> a
     com.android.tools.r8.com.google.common.hash.Hasher newHasher() -> a
-com.android.tools.r8.com.google.common.hash.Hasher -> com.android.tools.r8.internal.tR0:
+com.android.tools.r8.com.google.common.hash.Hasher -> com.android.tools.r8.internal.wR0:
     com.android.tools.r8.com.google.common.hash.HashCode hash() -> a
     com.android.tools.r8.com.google.common.hash.Hasher putBoolean(boolean) -> a
     com.android.tools.r8.com.google.common.hash.Hasher putByte(byte) -> a
@@ -52301,17 +52301,17 @@ com.android.tools.r8.com.google.common.hash.Hasher -> com.android.tools.r8.inter
     com.android.tools.r8.com.google.common.hash.Hasher putInt(int) -> a
     com.android.tools.r8.com.google.common.hash.Hasher putLong(long) -> a
     com.android.tools.r8.com.google.common.hash.Hasher putString(java.lang.CharSequence,java.nio.charset.Charset) -> a
-com.android.tools.r8.com.google.common.hash.Hashing -> com.android.tools.r8.internal.vR0:
+com.android.tools.r8.com.google.common.hash.Hashing -> com.android.tools.r8.internal.yR0:
 # {"id":"sourceFile","fileName":"Hashing.java"}
     int GOOD_FAST_HASH_SEED -> a
     1:1:void <clinit>():90:90 -> <clinit>
     1:1:com.android.tools.r8.com.google.common.hash.HashFunction murmur3_128():133:133 -> a
     1:1:com.android.tools.r8.com.google.common.hash.HashFunction murmur3_32():111:111 -> b
     1:1:com.android.tools.r8.com.google.common.hash.HashFunction sha256():200:200 -> c
-com.android.tools.r8.com.google.common.hash.Hashing$Sha256Holder -> com.android.tools.r8.internal.uR0:
+com.android.tools.r8.com.google.common.hash.Hashing$Sha256Holder -> com.android.tools.r8.internal.xR0:
     com.android.tools.r8.com.google.common.hash.HashFunction SHA_256 -> a
     1:1:void <clinit>():204:204 -> <clinit>
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.internal.i71:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.internal.l71:
     java.security.MessageDigest prototype -> a
     int bytes -> b
     boolean supportsClone -> c
@@ -52326,8 +52326,8 @@ com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.and
     15:15:java.security.MessageDigest com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction.getMessageDigest(java.lang.String):79:79 -> a
     15:15:com.android.tools.r8.com.google.common.hash.Hasher newHasher():92 -> a
     1:1:java.lang.String toString():72:72 -> toString
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$1 -> com.android.tools.r8.internal.g71:
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.internal.h71:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$1 -> com.android.tools.r8.internal.j71:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.internal.k71:
     java.security.MessageDigest digest -> b
     java.nio.ByteBuffer com.android.tools.r8.com.google.common.hash.AbstractByteHasher.scratch -> a
     int bytes -> c
@@ -52375,7 +52375,7 @@ com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDig
     1:3:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractByteHasher.update(int):102:104 -> b
     4:5:void update(byte[],int,int):138:139 -> b
     6:6:void checkNotDone():149:149 -> b
-com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction -> com.android.tools.r8.internal.e91:
+com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction -> com.android.tools.r8.internal.h91:
     com.android.tools.r8.com.google.common.hash.HashFunction MURMUR3_128 -> a
     1:3:void <clinit>():43:45 -> <clinit>
     1:1:void <init>(int):51:51 -> <init>
@@ -52383,7 +52383,7 @@ com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction -> com.andro
     1:3:boolean equals(java.lang.Object):72:74 -> equals
     1:1:int hashCode():81:81 -> hashCode
     1:1:java.lang.String toString():67:67 -> toString
-com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher -> com.android.tools.r8.internal.d91:
+com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher -> com.android.tools.r8.internal.g91:
     long h2 -> e
     int length -> f
     long h1 -> d
@@ -52469,7 +52469,7 @@ com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128H
     1:20:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putBytesInternal(java.nio.ByteBuffer):113:132 -> b
     21:27:void com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.munch():208:214 -> b
     1:3:void com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.munchIfFull():201:203 -> c
-com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction -> com.android.tools.r8.internal.g91:
+com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction -> com.android.tools.r8.internal.j91:
     com.android.tools.r8.com.google.common.hash.HashFunction MURMUR3_32 -> a
     1:3:void <clinit>():53:55 -> <clinit>
     1:1:void <init>(int):65:65 -> <init>
@@ -52501,7 +52501,7 @@ com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction -> com.androi
     1:3:boolean equals(java.lang.Object):86:88 -> equals
     1:1:int hashCode():95:95 -> hashCode
     1:1:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction$Murmur3_32Hasher -> com.android.tools.r8.internal.f91:
+com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction$Murmur3_32Hasher -> com.android.tools.r8.internal.i91:
     long buffer -> b
     boolean isDone -> e
     int length -> d
@@ -52520,7 +52520,7 @@ com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction$Murmur3_32Has
     57:57:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractHasher.putString(java.lang.CharSequence,java.nio.charset.Charset):55:55 -> a
     57:57:com.android.tools.r8.com.google.common.hash.Hasher putString(java.lang.CharSequence,java.nio.charset.Charset):378 -> a
     58:61:com.android.tools.r8.com.google.common.hash.HashCode hash():384:387 -> a
-com.android.tools.r8.com.google.common.io.BaseEncoding -> com.android.tools.r8.internal.WA0:
+com.android.tools.r8.com.google.common.io.BaseEncoding -> com.android.tools.r8.internal.ZA0:
     com.android.tools.r8.com.google.common.io.BaseEncoding BASE64_URL -> a
     1:45:void <clinit>():315:359 -> <clinit>
     46:46:void com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding.<init>(java.lang.String,java.lang.String,java.lang.Character):563:563 -> <clinit>
@@ -52543,7 +52543,7 @@ com.android.tools.r8.com.google.common.io.BaseEncoding -> com.android.tools.r8.i
     12:12:java.lang.String encode(byte[]):144 -> a
     13:13:com.android.tools.r8.com.google.common.io.BaseEncoding base64Url():355:355 -> a
     com.android.tools.r8.com.google.common.io.BaseEncoding omitPadding() -> b
-com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet -> com.android.tools.r8.internal.SA0:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet -> com.android.tools.r8.internal.VA0:
     char[] chars -> c
     int charsPerChunk -> f
     byte[] decodabet -> h
@@ -52560,19 +52560,19 @@ com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet -> com.android.t
     1:3:boolean equals(java.lang.Object):543:545 -> equals
     1:1:int hashCode():552:552 -> hashCode
     1:1:java.lang.String toString():538:538 -> toString
-com.android.tools.r8.com.google.common.io.BaseEncoding$Base16Encoding -> com.android.tools.r8.internal.TA0:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Base16Encoding -> com.android.tools.r8.internal.WA0:
     char[] encoding -> d
     1:1:void <init>(java.lang.String,java.lang.String):847:847 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet):851:851 -> <init>
     3:14:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet):844:855 -> <init>
     1:5:void encodeTo(java.lang.Appendable,byte[],int,int):862:866 -> a
     6:6:com.android.tools.r8.com.google.common.io.BaseEncoding newInstance(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):886:886 -> a
-com.android.tools.r8.com.google.common.io.BaseEncoding$Base64Encoding -> com.android.tools.r8.internal.UA0:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Base64Encoding -> com.android.tools.r8.internal.XA0:
     1:1:void <init>(java.lang.String,java.lang.String,java.lang.Character):892:892 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):896:897 -> <init>
     1:11:void encodeTo(java.lang.Appendable,byte[],int,int):903:913 -> a
     12:12:com.android.tools.r8.com.google.common.io.BaseEncoding newInstance(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):943:943 -> a
-com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding -> com.android.tools.r8.internal.VA0:
+com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding -> com.android.tools.r8.internal.YA0:
     java.lang.Character paddingChar -> c
     com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet alphabet -> b
     1:4:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):566:569 -> <init>
@@ -52587,7 +52587,7 @@ com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding -> c
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):76:76 -> hashCode
     2:2:int hashCode():839 -> hashCode
     1:10:java.lang.String toString():815:824 -> toString
-com.android.tools.r8.com.google.common.io.ByteStreams -> com.android.tools.r8.internal.EC0:
+com.android.tools.r8.com.google.common.io.ByteStreams -> com.android.tools.r8.internal.HC0:
     java.io.OutputStream NULL_OUTPUT_STREAM -> a
     1:1:void <clinit>():594:594 -> <clinit>
     1:3:byte[] toByteArray(java.io.InputStream):165:167 -> a
@@ -52596,14 +52596,14 @@ com.android.tools.r8.com.google.common.io.ByteStreams -> com.android.tools.r8.in
     5:5:byte[] com.android.tools.r8.com.google.common.io.ByteStreams.createBuffer():56:56 -> a
     5:5:long copy(java.io.InputStream,java.io.OutputStream):103 -> a
     6:10:long copy(java.io.InputStream,java.io.OutputStream):106:110 -> a
-com.android.tools.r8.com.google.common.io.ByteStreams$1 -> com.android.tools.r8.internal.DC0:
+com.android.tools.r8.com.google.common.io.ByteStreams$1 -> com.android.tools.r8.internal.GC0:
     1:1:void <init>():595:595 -> <init>
     1:1:java.lang.String toString():614:614 -> toString
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> write
     1:1:void write(byte[]):603 -> write
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> write
     2:2:void write(byte[],int,int):609 -> write
-com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.internal.EF0:
+com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.internal.HF0:
     java.lang.CharSequence seq -> a
     int pos -> b
     int mark -> c
@@ -52621,12 +52621,12 @@ com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tool
     1:1:boolean ready():106:106 -> ready
     1:2:void reset():124:125 -> reset
     1:4:long skip(long):97:100 -> skip
-com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.internal.HF0:
+com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.internal.KF0:
     1:1:void <init>():76:76 -> <init>
     1:2:java.io.BufferedReader openBufferedStream():113:114 -> a
     3:3:com.android.tools.r8.com.google.common.io.CharSource wrap(java.lang.CharSequence):479:479 -> a
     java.io.Reader openStream() -> b
-com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.internal.FF0:
+com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.internal.IF0:
     java.lang.CharSequence seq -> a
     1:1:void <clinit>():525:525 -> <clinit>
     1:2:void <init>(java.lang.CharSequence):529:530 -> <init>
@@ -52638,13 +52638,13 @@ com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> c
     3:15:java.lang.String com.android.tools.r8.com.google.common.base.Ascii.truncate(java.lang.CharSequence,int,java.lang.String):559:571 -> toString
     3:15:java.lang.String toString():609 -> toString
     16:16:java.lang.String toString():609:609 -> toString
-com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.internal.GF0:
+com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.internal.JF0:
     1:1:void <init>(java.lang.String):630:630 -> <init>
     1:1:java.io.Reader openStream():635:635 -> b
-com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.internal.RH0:
+com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.internal.UH0:
     java.util.logging.Logger logger -> a
     1:1:void <clinit>():37:37 -> <clinit>
-com.android.tools.r8.com.google.common.io.Closer -> com.android.tools.r8.internal.VH0:
+com.android.tools.r8.com.google.common.io.Closer -> com.android.tools.r8.internal.YH0:
     com.android.tools.r8.com.google.common.io.Closer$Suppressor suppressor -> a
     java.util.Deque stack -> b
     com.android.tools.r8.com.google.common.io.Closer$Suppressor SUPPRESSOR -> c
@@ -52677,12 +52677,12 @@ com.android.tools.r8.com.google.common.io.Closer -> com.android.tools.r8.interna
     24:24:void com.android.tools.r8.com.google.common.base.Throwables.propagateIfInstanceOf(java.lang.Throwable,java.lang.Class):104 -> close
     24:24:void com.android.tools.r8.com.google.common.base.Throwables.propagateIfPossible(java.lang.Throwable,java.lang.Class):184 -> close
     24:24:void close():227 -> close
-com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.internal.SH0:
+com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.internal.VH0:
     com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor INSTANCE -> a
     1:1:void <clinit>():251:251 -> <clinit>
     1:1:void <init>():249:249 -> <init>
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):256:256 -> a
-com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.android.tools.r8.internal.TH0:
+com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.android.tools.r8.internal.WH0:
     com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor INSTANCE -> a
     java.lang.reflect.Method addSuppressed -> b
     1:1:void <clinit>():268:268 -> <clinit>
@@ -52693,9 +52693,9 @@ com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.an
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):291:291 -> a
     2:2:void com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor.suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):256:256 -> a
     2:2:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):294 -> a
-com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.internal.UH0:
+com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.internal.XH0:
     void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable) -> a
-com.android.tools.r8.com.google.common.math.IntMath -> com.android.tools.r8.internal.HW0:
+com.android.tools.r8.com.google.common.math.IntMath -> com.android.tools.r8.internal.KW0:
     int[] biggestBinomials -> a
     1:1:void <clinit>():675:675 -> <clinit>
     boolean isPowerOfTwo(int) -> a
@@ -52715,14 +52715,14 @@ com.android.tools.r8.com.google.common.math.IntMath -> com.android.tools.r8.inte
     108:108:void com.android.tools.r8.com.google.common.math.MathPreconditions.checkRoundingUnnecessary(boolean):81:81 -> a
     108:108:int divide(int,int,java.math.RoundingMode):340 -> a
     109:109:int divide(int,int,java.math.RoundingMode):320:320 -> a
-com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.internal.GW0:
+com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.internal.JW0:
     int[] $SwitchMap$java$math$RoundingMode -> a
     1:1:void <clinit>():121:121 -> <clinit>
-com.android.tools.r8.com.google.common.math.MathPreconditions -> com.android.tools.r8.internal.M61:
+com.android.tools.r8.com.google.common.math.MathPreconditions -> com.android.tools.r8.internal.P61:
     1:1:int checkNonNegative(java.lang.String,int):53:53 -> a
-com.android.tools.r8.com.google.common.primitives.Ints -> com.android.tools.r8.internal.IX0:
+com.android.tools.r8.com.google.common.primitives.Ints -> com.android.tools.r8.internal.LX0:
     int saturatedCast(long) -> a
-com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.internal.LY0:
+com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.internal.OY0:
     java.util.List elements -> a
     1:2:void <init>():39:40 -> <init>
     1:1:void add(java.lang.String):85:85 -> a
@@ -52736,7 +52736,7 @@ com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.internal.
     1:1:int hashCode():371:371 -> hashCode
     1:1:java.util.Iterator iterator():171:171 -> iterator
     1:1:int size():161:161 -> size
-com.android.tools.r8.com.google.gson.JsonElement -> com.android.tools.r8.internal.MY0:
+com.android.tools.r8.com.google.gson.JsonElement -> com.android.tools.r8.internal.PY0:
     1:1:void <init>():33:33 -> <init>
     1:1:boolean getAsBoolean():152:152 -> a
     1:1:int getAsInt():243:243 -> b
@@ -52752,15 +52752,15 @@ com.android.tools.r8.com.google.gson.JsonElement -> com.android.tools.r8.interna
     4:4:void com.android.tools.r8.com.google.gson.internal.Streams.write(com.android.tools.r8.com.google.gson.JsonElement,com.android.tools.r8.com.google.gson.stream.JsonWriter):72:72 -> toString
     4:4:java.lang.String toString():324 -> toString
     5:7:java.lang.String toString():325:327 -> toString
-com.android.tools.r8.com.google.gson.JsonIOException -> com.android.tools.r8.internal.NY0:
+com.android.tools.r8.com.google.gson.JsonIOException -> com.android.tools.r8.internal.QY0:
     1:1:void <init>(java.lang.Throwable):43:43 -> <init>
-com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.internal.OY0:
+com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.internal.RY0:
     com.android.tools.r8.com.google.gson.JsonNull INSTANCE -> a
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>():39:39 -> <init>
     1:1:boolean equals(java.lang.Object):61:61 -> equals
     1:1:int hashCode():53:53 -> hashCode
-com.android.tools.r8.com.google.gson.JsonObject -> com.android.tools.r8.internal.PY0:
+com.android.tools.r8.com.google.gson.JsonObject -> com.android.tools.r8.internal.SY0:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap members -> a
     1:2:void <init>():32:33 -> <init>
     1:3:void add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):55:57 -> a
@@ -52779,11 +52779,11 @@ com.android.tools.r8.com.google.gson.JsonObject -> com.android.tools.r8.internal
     1:1:java.util.Set entrySet():132:132 -> entrySet
     1:2:boolean equals(java.lang.Object):196:197 -> equals
     1:1:int hashCode():202:202 -> hashCode
-com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.internal.QY0:
+com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.internal.TY0:
     1:1:void <init>(java.lang.String):42:42 -> <init>
     2:2:void <init>(java.lang.String,java.lang.Throwable):52:52 -> <init>
     3:3:void <init>(java.lang.Throwable):62:62 -> <init>
-com.android.tools.r8.com.google.gson.JsonParser -> com.android.tools.r8.internal.RY0:
+com.android.tools.r8.com.google.gson.JsonParser -> com.android.tools.r8.internal.UY0:
     1:1:void <init>():34:34 -> <init>
     1:1:com.android.tools.r8.com.google.gson.JsonElement parse(java.lang.String):45:45 -> a
     2:4:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.JsonParser.parse(java.io.Reader):58:60 -> a
@@ -52800,7 +52800,7 @@ com.android.tools.r8.com.google.gson.JsonParser -> com.android.tools.r8.internal
     18:27:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):81:90 -> a
     28:28:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):88:88 -> a
     29:33:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):86:90 -> a
-com.android.tools.r8.com.google.gson.JsonPrimitive -> com.android.tools.r8.internal.SY0:
+com.android.tools.r8.com.google.gson.JsonPrimitive -> com.android.tools.r8.internal.VY0:
     java.lang.Class[] PRIMITIVE_TYPES -> b
     java.lang.Object value -> a
     1:1:void <clinit>():35:35 -> <clinit>
@@ -52839,14 +52839,14 @@ com.android.tools.r8.com.google.gson.JsonPrimitive -> com.android.tools.r8.inter
     1:1:boolean isBoolean():112:112 -> h
     1:13:int hashCode():289:301 -> hashCode
     1:1:boolean isNumber():146:146 -> i
-com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.internal.UY0:
+com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.internal.XY0:
     1:1:void <init>(java.lang.String):30:30 -> <init>
     2:2:void <init>(java.lang.Throwable):45:45 -> <init>
-com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.internal.rr1:
+com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.internal.jr1:
     1:1:void <init>():119:119 -> <init>
     java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader) -> a
     void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object) -> a
-com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.tools.r8.internal.m41:
+com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.tools.r8.internal.p41:
     java.lang.String value -> a
     1:2:void <init>(java.lang.String):30:31 -> <init>
     1:1:double doubleValue():63:63 -> doubleValue
@@ -52856,7 +52856,7 @@ com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.
     1:6:int intValue():37:42 -> intValue
     1:3:long longValue():50:52 -> longValue
     1:1:java.lang.String toString():68:68 -> toString
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap -> com.android.tools.r8.internal.g51:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap -> com.android.tools.r8.internal.j51:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node header -> e
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet keySet -> g
     java.util.Comparator NATURAL_ORDER -> h
@@ -52899,12 +52899,12 @@ com.android.tools.r8.com.google.gson.internal.LinkedTreeMap -> com.android.tools
     1:3:java.lang.Object remove(java.lang.Object):111 -> remove
     4:4:java.lang.Object remove(java.lang.Object):112:112 -> remove
     1:1:int size():78:78 -> size
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1 -> com.android.tools.r8.internal.Z41:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1 -> com.android.tools.r8.internal.c51:
     1:1:void <init>():40:40 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):40:40 -> compare
     2:2:int com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1.compare(java.lang.Comparable,java.lang.Comparable):42:42 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):40 -> compare
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet -> com.android.tools.r8.internal.b51:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet -> com.android.tools.r8.internal.e51:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):560:560 -> <init>
     1:1:void clear():591:591 -> clear
@@ -52912,11 +52912,11 @@ com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet -> com.andr
     1:1:java.util.Iterator iterator():566:566 -> iterator
     1:9:boolean remove(java.lang.Object):578:586 -> remove
     1:1:int size():562:562 -> size
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1 -> com.android.tools.r8.internal.a51:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1 -> com.android.tools.r8.internal.d51:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet):566:566 -> <init>
     1:1:java.util.Map$Entry com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1.next():568:568 -> next
     1:1:java.lang.Object next():566 -> next
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet -> com.android.tools.r8.internal.d51:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet -> com.android.tools.r8.internal.g51:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):595:595 -> <init>
     1:1:void clear():617:617 -> clear
@@ -52928,10 +52928,10 @@ com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet -> com.androi
     2:4:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap.removeInternalByKey(java.lang.Object):277:279 -> remove
     2:4:boolean remove(java.lang.Object):613 -> remove
     1:1:int size():597:597 -> size
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet$1 -> com.android.tools.r8.internal.c51:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet$1 -> com.android.tools.r8.internal.f51:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet):601:601 -> <init>
     1:1:java.lang.Object next():603:603 -> next
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator -> com.android.tools.r8.internal.e51:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator -> com.android.tools.r8.internal.h51:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> d
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node lastReturned -> b
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node next -> a
@@ -52944,7 +52944,7 @@ com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterato
     11:11:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():541:541 -> l
     1:6:void remove():551:556 -> remove
     7:7:void remove():552:552 -> remove
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node -> com.android.tools.r8.internal.f51:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node -> com.android.tools.r8.internal.i51:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node next -> d
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node right -> c
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node prev -> e
@@ -52961,16 +52961,16 @@ com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node -> com.android.
     1:2:int hashCode():491:492 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):475:476 -> setValue
     1:1:java.lang.String toString():496:496 -> toString
-com.android.tools.r8.com.google.gson.internal.Streams -> com.android.tools.r8.internal.Lo1:
+com.android.tools.r8.com.google.gson.internal.Streams -> com.android.tools.r8.internal.Do1:
 # {"id":"sourceFile","fileName":"Streams.java"}
     1:19:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):46:64 -> a
     20:20:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):62:62 -> a
     21:21:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):60:60 -> a
     22:25:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):55:58 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters -> com.android.tools.r8.internal.tr1:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters -> com.android.tools.r8.internal.lr1:
     com.android.tools.r8.com.google.gson.TypeAdapter JSON_ELEMENT -> a
     1:1:void <clinit>():714:714 -> <clinit>
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.internal.sr1:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.internal.kr1:
     1:1:void <init>():714:714 -> <init>
     1:1:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonNull():74:74 -> a
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,com.android.tools.r8.com.google.gson.JsonElement):753 -> a
@@ -52996,7 +52996,7 @@ com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.androi
     37:38:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):720:721 -> b
     39:62:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):718:741 -> b
     63:68:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):728:733 -> b
-com.android.tools.r8.com.google.gson.stream.JsonReader -> com.android.tools.r8.internal.TY0:
+com.android.tools.r8.com.google.gson.stream.JsonReader -> com.android.tools.r8.internal.WY0:
     long peekedLong -> i
     char[] buffer -> c
     int stackSize -> m
@@ -53084,12 +53084,12 @@ com.android.tools.r8.com.google.gson.stream.JsonReader -> com.android.tools.r8.i
     1:35:com.android.tools.r8.com.google.gson.stream.JsonToken peek():423:457 -> o
     1:5:void skipToEndOfLine():1411:1415 -> p
     1:1:java.lang.String toString():1445:1445 -> toString
-com.android.tools.r8.com.google.gson.stream.JsonToken$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.VY0:
+com.android.tools.r8.com.google.gson.stream.JsonToken$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.YY0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.google.gson.stream.JsonWriter -> com.android.tools.r8.internal.WY0:
+com.android.tools.r8.com.google.gson.stream.JsonWriter -> com.android.tools.r8.internal.ZY0:
     java.lang.String deferredName -> f
     int[] stack -> b
     java.lang.String[] REPLACEMENT_CHARS -> h
@@ -53139,7 +53139,7 @@ com.android.tools.r8.com.google.gson.stream.JsonWriter -> com.android.tools.r8.i
     10:11:void writeDeferredName():402:403 -> h
     12:12:void com.android.tools.r8.com.google.gson.stream.JsonWriter.beforeName():616:616 -> h
     12:12:void writeDeferredName():401 -> h
-com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.internal.q61:
+com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.internal.t61:
     1:1:void <init>(java.lang.String):29:29 -> <init>
 com.android.tools.r8.compatproguard.CompatProguard -> com.android.tools.r8.compatproguard.CompatProguard:
     1:21:void run(java.lang.String[]):190:210 -> a
@@ -53183,7 +53183,7 @@ com.android.tools.r8.compatproguard.CompatProguard$CompatProguardOptions -> com.
     60:60:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
     60:60:com.android.tools.r8.compatproguard.CompatProguard$CompatProguardOptions parse(java.lang.String[]):128 -> a
     61:81:com.android.tools.r8.compatproguard.CompatProguard$CompatProguardOptions parse(java.lang.String[]):128:148 -> a
-com.android.tools.r8.contexts.CompilationContext -> com.android.tools.r8.internal.WI0:
+com.android.tools.r8.contexts.CompilationContext -> com.android.tools.r8.internal.ZI0:
     java.util.Map seenSetForTesting -> b
     java.util.function.Consumer testingConsumer -> a
     int nextProcessorId -> c
@@ -53195,13 +53195,13 @@ com.android.tools.r8.contexts.CompilationContext -> com.android.tools.r8.interna
     2:2:com.android.tools.r8.contexts.CompilationContext createInitialContext(com.android.tools.r8.utils.InternalOptions):34:34 -> a
     3:9:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):46:52 -> a
     10:11:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():65:66 -> a
-com.android.tools.r8.contexts.CompilationContext$1 -> com.android.tools.r8.internal.RI0:
-com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider -> com.android.tools.r8.internal.SI0:
+com.android.tools.r8.contexts.CompilationContext$1 -> com.android.tools.r8.internal.UI0:
+com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider -> com.android.tools.r8.internal.VI0:
     1:1:void <init>():18:18 -> <init>
     2:2:void <init>(com.android.tools.r8.contexts.CompilationContext$1):18:18 -> <init>
     java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder) -> a
     java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder) -> b
-com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext -> com.android.tools.r8.internal.TI0:
+com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext -> com.android.tools.r8.internal.WI0:
     com.android.tools.r8.graph.ProgramMethod method -> b
     int nextId -> c
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext parent -> a
@@ -53218,7 +53218,7 @@ com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext -> com.
     2:2:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):160:160 -> b
     1:1:com.android.tools.r8.graph.ProgramMethod getMethodContext():141:141 -> c
     2:4:java.lang.StringBuilder buildSuffix(java.lang.StringBuilder):146:148 -> c
-com.android.tools.r8.contexts.CompilationContext$ProcessorContext -> com.android.tools.r8.internal.UI0:
+com.android.tools.r8.contexts.CompilationContext$ProcessorContext -> com.android.tools.r8.internal.XI0:
     com.android.tools.r8.contexts.CompilationContext parent -> a
     int processorId -> b
     boolean $assertionsDisabled -> c
@@ -53235,7 +53235,7 @@ com.android.tools.r8.contexts.CompilationContext$ProcessorContext -> com.android
     6:6:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):103 -> a
     1:1:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$ProcessorContext.buildSuffix(java.lang.StringBuilder):98:98 -> b
     1:1:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):108 -> b
-com.android.tools.r8.contexts.CompilationContext$UniqueContext -> com.android.tools.r8.internal.VI0:
+com.android.tools.r8.contexts.CompilationContext$UniqueContext -> com.android.tools.r8.internal.YI0:
     com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext parent -> a
     int positionId -> b
     1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,int,com.android.tools.r8.contexts.CompilationContext$1):164:164 -> <init>
@@ -53254,14 +53254,14 @@ com.android.tools.r8.contexts.CompilationContext$UniqueContext -> com.android.to
     5:5:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$UniqueContext.buildSyntheticSuffix(java.lang.StringBuilder):184 -> b
     5:5:java.lang.String getSyntheticSuffix():192 -> b
     6:6:java.lang.String getSyntheticSuffix():192:192 -> b
-com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator -> com.android.tools.r8.internal.ZK0:
+com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator -> com.android.tools.r8.internal.cL0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.NamingLens namingLens -> b
     com.android.tools.r8.utils.InternalOptions options -> c
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):53:56 -> <init>
     1:1:boolean com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator.shouldRun():68:68 -> a
     1:1:void runIfNecessary(com.android.tools.r8.utils.Timing):60 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
     2:2:boolean com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator.shouldRun():68 -> a
     2:2:void runIfNecessary(com.android.tools.r8.utils.Timing):60 -> a
     3:3:boolean com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator.shouldRun():68:68 -> a
@@ -53376,10 +53376,10 @@ com.android.tools.r8.dex.ApplicationWriter -> com.android.tools.r8.dex.e:
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.List,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):162:162 -> <init>
     2:13:void <init>(com.android.tools.r8.graph.AppView,java.util.List,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier,com.android.tools.r8.DexIndexedConsumer):179:190 -> <init>
     1:1:java.util.List distribute(java.util.concurrent.ExecutorService):197:197 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():468:468 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():474:474 -> a
     2:2:java.util.List distribute(java.util.concurrent.ExecutorService):197 -> a
     3:3:java.util.List distribute(java.util.concurrent.ExecutorService):198:198 -> a
-    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():484:484 -> a
+    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():490:490 -> a
     4:4:java.util.List distribute(java.util.concurrent.ExecutorService):199 -> a
     5:14:java.util.List distribute(java.util.concurrent.ExecutorService):199:208 -> a
     15:16:void encodeChecksums(java.lang.Iterable):218:219 -> a
@@ -53391,12 +53391,12 @@ com.android.tools.r8.dex.ApplicationWriter -> com.android.tools.r8.dex.e:
     30:30:com.android.tools.r8.utils.Timing lambda$write$2(com.android.tools.r8.dex.VirtualFile):295:295 -> a
     31:40:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):318:327 -> a
     31:40:com.android.tools.r8.utils.Timing lambda$write$2(com.android.tools.r8.dex.VirtualFile):296 -> a
-    41:41:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():484:484 -> a
+    41:41:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():490:490 -> a
     41:41:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):327 -> a
     41:41:com.android.tools.r8.utils.Timing lambda$write$2(com.android.tools.r8.dex.VirtualFile):296 -> a
     42:48:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):330:336 -> a
     42:48:com.android.tools.r8.utils.Timing lambda$write$2(com.android.tools.r8.dex.VirtualFile):296 -> a
-    49:49:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():480:480 -> a
+    49:49:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():486:486 -> a
     49:49:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):336 -> a
     49:49:com.android.tools.r8.utils.Timing lambda$write$2(com.android.tools.r8.dex.VirtualFile):296 -> a
     50:58:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):340:348 -> a
@@ -53492,7 +53492,7 @@ com.android.tools.r8.dex.ApplicationWriter -> com.android.tools.r8.dex.e:
     63:64:int com.android.tools.r8.utils.ThreadUtils.getNumberOfThreads(java.util.concurrent.ExecutorService):186:187 -> c
     63:64:void write(java.util.concurrent.ExecutorService):290 -> c
     65:80:void write(java.util.concurrent.ExecutorService):290:305 -> c
-    81:81:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> c
+    81:81:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> c
     81:81:void write(java.util.concurrent.ExecutorService):305 -> c
     82:90:void write(java.util.concurrent.ExecutorService):305:313 -> c
 com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.dex.c:
@@ -53535,7 +53535,7 @@ com.android.tools.r8.dex.BinaryReader -> com.android.tools.r8.dex.f:
     1:1:int getUleb128():44:44 -> e
     1:1:int getUleb128p1():52 -> e
     1:2:int getUshort():62:63 -> f
-com.android.tools.r8.dex.ClassesChecksum -> com.android.tools.r8.internal.LH0:
+com.android.tools.r8.dex.ClassesChecksum -> com.android.tools.r8.internal.OH0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap dictionary -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():14:14 -> <clinit>
@@ -53561,7 +53561,7 @@ com.android.tools.r8.dex.CodeToKeep -> com.android.tools.r8.dex.k:
     void recordHierarchyOf(com.android.tools.r8.graph.DexProgramClass) -> 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():437:437 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> 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:8:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):26:30 -> a
     9:9:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):28:28 -> a
@@ -53609,7 +53609,7 @@ com.android.tools.r8.dex.CodeToKeep$NopCodeToKeep -> com.android.tools.r8.dex.j:
     void recordHierarchyOf(com.android.tools.r8.graph.DexProgramClass) -> a
     void recordMethod(com.android.tools.r8.graph.DexMethod) -> a
     1:1:void generateKeepRules(com.android.tools.r8.utils.InternalOptions):223:223 -> a
-com.android.tools.r8.dex.CompatByteBuffer -> com.android.tools.r8.internal.QI0:
+com.android.tools.r8.dex.CompatByteBuffer -> com.android.tools.r8.internal.TI0:
     java.nio.ByteBuffer buffer -> a
     1:2:void <init>(java.nio.ByteBuffer):21:22 -> <init>
     1:1:java.nio.ByteBuffer com.android.tools.r8.dex.CompatByteBuffer.asByteBuffer():34:34 -> a
@@ -53677,12 +53677,12 @@ com.android.tools.r8.dex.CompatByteBuffer -> com.android.tools.r8.internal.QI0:
     1:1:java.nio.Buffer com.android.tools.r8.dex.CompatByteBuffer.asBuffer():30:30 -> m
     1:1:void rewind():48 -> m
     2:2:void rewind():48:48 -> m
-com.android.tools.r8.dex.Constants -> com.android.tools.r8.internal.HJ0:
+com.android.tools.r8.dex.Constants -> com.android.tools.r8.internal.KJ0:
     byte[] VDEX_FILE_MAGIC_PREFIX -> b
     byte[] DEX_FILE_MAGIC_PREFIX -> a
     com.android.tools.r8.cf.CfVersion CORRESPONDING_CLASS_FILE_VERSION -> c
     1:12:void <clinit>():10:21 -> <clinit>
-com.android.tools.r8.dex.DebugBytecodeWriter -> com.android.tools.r8.internal.eK0:
+com.android.tools.r8.dex.DebugBytecodeWriter -> com.android.tools.r8.internal.hK0:
     com.android.tools.r8.graph.ObjectToOffsetMapping mapping -> a
     com.android.tools.r8.graph.DexDebugInfo info -> c
     java.nio.ByteBuffer buffer -> d
@@ -53795,141 +53795,138 @@ com.android.tools.r8.dex.DexParser -> com.android.tools.r8.dex.r:
     51:52:java.lang.String com.android.tools.r8.graph.DexAnnotation.getSignature(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):285:286 -> a
     51:52:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):645 -> a
     53:56:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):647:650 -> a
-    57:61:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):649:653 -> a
-    62:62:void com.android.tools.r8.graph.DexEncodedField.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):69:69 -> a
-    62:62:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):653 -> a
-    63:63:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):653:653 -> a
-    64:71:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):665:672 -> a
-    72:72:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    72:72:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
-    73:73:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):673:673 -> a
-    74:74:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    74:74:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):673 -> a
-    75:76:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):673:674 -> a
+    57:68:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):649:660 -> a
+    69:76:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):670:677 -> a
     77:77:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    77:77:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):674 -> a
-    78:92:void ensureCodesInited(int):150:164 -> a
-    78:92:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    93:93:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    93:93:void ensureCodesInited(int):164 -> a
-    93:93:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    94:95:void ensureCodesInited(int):165:166 -> a
-    94:95:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    96:99:void com.android.tools.r8.dex.BinaryReader.align(int):90:93 -> a
-    96:99:void ensureCodesInited(int):166 -> a
-    96:99:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    100:112:com.android.tools.r8.graph.DexCode parseCodeItem():892:904 -> a
-    100:112:void ensureCodesInited(int):167 -> a
-    100:112:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    113:113:short com.android.tools.r8.dex.BinaryReader.getShort():68:68 -> a
-    113:113:com.android.tools.r8.graph.DexCode parseCodeItem():904 -> a
-    113:113:void ensureCodesInited(int):167 -> a
-    113:113:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    114:129:com.android.tools.r8.graph.DexCode parseCodeItem():904:919 -> a
-    114:129:void ensureCodesInited(int):167 -> a
-    114:129:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    130:130:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    130:130:com.android.tools.r8.graph.DexCode parseCodeItem():919 -> a
-    130:130:void ensureCodesInited(int):167 -> a
-    130:130:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    131:131:com.android.tools.r8.graph.DexCode parseCodeItem():921:921 -> a
-    131:131:void ensureCodesInited(int):167 -> a
-    131:131:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    132:132:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    132:132:com.android.tools.r8.graph.DexCode parseCodeItem():921 -> a
-    132:132:void ensureCodesInited(int):167 -> a
-    132:132:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    133:137:com.android.tools.r8.graph.DexCode parseCodeItem():922:926 -> a
-    133:137:void ensureCodesInited(int):167 -> a
-    133:137:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    138:138:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    138:138:com.android.tools.r8.graph.DexCode parseCodeItem():926 -> a
-    138:138:void ensureCodesInited(int):167 -> a
-    138:138:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    139:141:com.android.tools.r8.graph.DexCode parseCodeItem():927:929 -> a
-    139:141:void ensureCodesInited(int):167 -> a
-    139:141:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    142:142:int com.android.tools.r8.dex.BinaryReader.getSleb128():48:48 -> a
-    142:142:com.android.tools.r8.graph.DexCode parseCodeItem():929 -> a
-    142:142:void ensureCodesInited(int):167 -> a
-    142:142:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    143:147:com.android.tools.r8.graph.DexCode parseCodeItem():930:934 -> a
-    143:147:void ensureCodesInited(int):167 -> a
-    143:147:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    148:148:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    148:148:com.android.tools.r8.graph.DexCode parseCodeItem():934 -> a
-    148:148:void ensureCodesInited(int):167 -> a
-    148:148:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    149:149:com.android.tools.r8.graph.DexCode parseCodeItem():935:935 -> a
-    149:149:void ensureCodesInited(int):167 -> a
-    149:149:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    150:150:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    150:150:com.android.tools.r8.graph.DexCode parseCodeItem():935 -> a
-    150:150:void ensureCodesInited(int):167 -> 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):677 -> a
-    151:155:com.android.tools.r8.graph.DexCode parseCodeItem():936:940 -> a
-    151:155:void ensureCodesInited(int):167 -> a
-    151:155:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    156:156:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    156:156:com.android.tools.r8.graph.DexCode parseCodeItem():940 -> a
-    156:156:void ensureCodesInited(int):167 -> a
-    156:156:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    157:160:com.android.tools.r8.graph.DexCode parseCodeItem():942:945 -> a
-    157:160:void ensureCodesInited(int):167 -> a
-    157:160:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    161:161:void com.android.tools.r8.graph.DexCode$Try.setHandlerIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):539:539 -> a
+    77:77:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
+    78:78:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):678:678 -> a
+    79:79:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
+    79:79:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):678 -> a
+    80:81:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):678:679 -> a
+    82:82:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
+    82:82:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):679 -> a
+    83:97:void ensureCodesInited(int):150:164 -> a
+    83:97:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    98:98:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
+    98:98:void ensureCodesInited(int):164 -> a
+    98:98:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    99:100:void ensureCodesInited(int):165:166 -> a
+    99:100:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    101:104:void com.android.tools.r8.dex.BinaryReader.align(int):90:93 -> a
+    101:104:void ensureCodesInited(int):166 -> a
+    101:104:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    105:117:com.android.tools.r8.graph.DexCode parseCodeItem():898:910 -> a
+    105:117:void ensureCodesInited(int):167 -> a
+    105:117:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    118:118:short com.android.tools.r8.dex.BinaryReader.getShort():68:68 -> a
+    118:118:com.android.tools.r8.graph.DexCode parseCodeItem():910 -> a
+    118:118:void ensureCodesInited(int):167 -> a
+    118:118:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    119:134:com.android.tools.r8.graph.DexCode parseCodeItem():910:925 -> a
+    119:134:void ensureCodesInited(int):167 -> a
+    119:134:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    135:135:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
+    135:135:com.android.tools.r8.graph.DexCode parseCodeItem():925 -> a
+    135:135:void ensureCodesInited(int):167 -> a
+    135:135:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    136:136:com.android.tools.r8.graph.DexCode parseCodeItem():927:927 -> a
+    136:136:void ensureCodesInited(int):167 -> a
+    136:136:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    137:137:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
+    137:137:com.android.tools.r8.graph.DexCode parseCodeItem():927 -> a
+    137:137:void ensureCodesInited(int):167 -> a
+    137:137:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    138:142:com.android.tools.r8.graph.DexCode parseCodeItem():928:932 -> a
+    138:142:void ensureCodesInited(int):167 -> a
+    138:142:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    143:143:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
+    143:143:com.android.tools.r8.graph.DexCode parseCodeItem():932 -> a
+    143:143:void ensureCodesInited(int):167 -> a
+    143:143:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    144:146:com.android.tools.r8.graph.DexCode parseCodeItem():933:935 -> a
+    144:146:void ensureCodesInited(int):167 -> a
+    144:146:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    147:147:int com.android.tools.r8.dex.BinaryReader.getSleb128():48:48 -> a
+    147:147:com.android.tools.r8.graph.DexCode parseCodeItem():935 -> a
+    147:147:void ensureCodesInited(int):167 -> a
+    147:147:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    148:152:com.android.tools.r8.graph.DexCode parseCodeItem():936:940 -> a
+    148:152:void ensureCodesInited(int):167 -> a
+    148:152:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    153:153:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
+    153:153:com.android.tools.r8.graph.DexCode parseCodeItem():940 -> a
+    153:153:void ensureCodesInited(int):167 -> a
+    153:153:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    154:154:com.android.tools.r8.graph.DexCode parseCodeItem():941:941 -> a
+    154:154:void ensureCodesInited(int):167 -> a
+    154:154:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    155:155:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
+    155:155:com.android.tools.r8.graph.DexCode parseCodeItem():941 -> a
+    155:155:void ensureCodesInited(int):167 -> a
+    155:155:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    156:160:com.android.tools.r8.graph.DexCode parseCodeItem():942:946 -> a
+    156:160:void ensureCodesInited(int):167 -> a
+    156:160:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    161:161:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
     161:161:com.android.tools.r8.graph.DexCode parseCodeItem():946 -> a
     161:161:void ensureCodesInited(int):167 -> a
-    161:161:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    162:162:com.android.tools.r8.graph.DexCode parseCodeItem():951:951 -> a
-    162:162:void ensureCodesInited(int):167 -> a
-    162:162:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    163:163:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    163:163:com.android.tools.r8.graph.DexCode parseCodeItem():951 -> a
-    163:163:void ensureCodesInited(int):167 -> a
-    163:163:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    164:169:com.android.tools.r8.graph.DexCode parseCodeItem():952:957 -> a
-    164:169:void ensureCodesInited(int):167 -> a
-    164:169:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    170:171:void ensureCodesInited(int):168:169 -> a
-    170:171:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):677 -> a
-    172:180:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):678:686 -> a
-    181:182:java.lang.String com.android.tools.r8.graph.DexAnnotation.getSignature(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):285:286 -> a
-    181:182:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):686 -> a
-    183:186:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):688:691 -> a
-    187:201:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):690:704 -> a
-    202:221:void addClassDefsTo(java.util.function.Consumer):711:730 -> a
-    222:222:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    222:222:void addClassDefsTo(java.util.function.Consumer):730 -> a
-    223:223:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    223:223:void addClassDefsTo(java.util.function.Consumer):730 -> a
-    224:226:void addClassDefsTo(java.util.function.Consumer):732:734 -> a
-    227:227:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
-    227:227:void addClassDefsTo(java.util.function.Consumer):734 -> a
-    228:230:void addClassDefsTo(java.util.function.Consumer):734:736 -> a
-    231:231:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
-    231:231:void addClassDefsTo(java.util.function.Consumer):736 -> a
-    232:269:void addClassDefsTo(java.util.function.Consumer):736:773 -> a
-    270:270:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    270:270:void addClassDefsTo(java.util.function.Consumer):773 -> a
-    271:271:void addClassDefsTo(java.util.function.Consumer):774:774 -> a
-    272:272:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    272:272:void addClassDefsTo(java.util.function.Consumer):774 -> a
-    273:273:void addClassDefsTo(java.util.function.Consumer):775:775 -> a
-    274:274:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    274:274:void addClassDefsTo(java.util.function.Consumer):775 -> a
-    275:275:void addClassDefsTo(java.util.function.Consumer):776:776 -> a
-    276:276:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    276:276:void addClassDefsTo(java.util.function.Consumer):776 -> a
-    277:279:void addClassDefsTo(java.util.function.Consumer):778:778 -> a
-    281:322:void addClassDefsTo(java.util.function.Consumer):780:821 -> a
-    323:344:void addClassDefsTo(java.util.function.Consumer):803:824 -> a
-    345:345:void addClassDefsTo(java.util.function.Consumer):752:752 -> a
-    346:346:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    346:346:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    346:346:void addClassDefsTo(java.util.function.Consumer):752 -> a
-    347:347:void addClassDefsTo(java.util.function.Consumer):752:752 -> a
-    348:348:long lambda$addClassDefsTo$0(java.lang.Long,com.android.tools.r8.graph.DexProgramClass):800:800 -> a
+    161:161:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    162:165:com.android.tools.r8.graph.DexCode parseCodeItem():948:951 -> a
+    162:165:void ensureCodesInited(int):167 -> a
+    162:165:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    166:166:void com.android.tools.r8.graph.DexCode$Try.setHandlerIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):546:546 -> a
+    166:166:com.android.tools.r8.graph.DexCode parseCodeItem():952 -> a
+    166:166:void ensureCodesInited(int):167 -> 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):682 -> a
+    167:167:com.android.tools.r8.graph.DexCode parseCodeItem():957:957 -> a
+    167:167:void ensureCodesInited(int):167 -> a
+    167:167:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    168:168:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
+    168:168:com.android.tools.r8.graph.DexCode parseCodeItem():957 -> a
+    168:168:void ensureCodesInited(int):167 -> a
+    168:168:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    169:174:com.android.tools.r8.graph.DexCode parseCodeItem():958:963 -> a
+    169:174:void ensureCodesInited(int):167 -> a
+    169:174:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    175:176:void ensureCodesInited(int):168:169 -> a
+    175:176:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):682 -> a
+    177:185:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):683:691 -> a
+    186:187:java.lang.String com.android.tools.r8.graph.DexAnnotation.getSignature(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):285:286 -> a
+    186:187:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):691 -> a
+    188:191:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):693:696 -> a
+    192:208:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):695:711 -> a
+    209:228:void addClassDefsTo(java.util.function.Consumer):717:736 -> a
+    229:229:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
+    229:229:void addClassDefsTo(java.util.function.Consumer):736 -> a
+    230:230:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    230:230:void addClassDefsTo(java.util.function.Consumer):736 -> a
+    231:233:void addClassDefsTo(java.util.function.Consumer):738:740 -> a
+    234:234:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
+    234:234:void addClassDefsTo(java.util.function.Consumer):740 -> a
+    235:237:void addClassDefsTo(java.util.function.Consumer):740:742 -> a
+    238:238:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
+    238:238:void addClassDefsTo(java.util.function.Consumer):742 -> a
+    239:276:void addClassDefsTo(java.util.function.Consumer):742:779 -> a
+    277:277:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
+    277:277:void addClassDefsTo(java.util.function.Consumer):779 -> a
+    278:278:void addClassDefsTo(java.util.function.Consumer):780:780 -> a
+    279:279:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
+    279:279:void addClassDefsTo(java.util.function.Consumer):780 -> a
+    280:280:void addClassDefsTo(java.util.function.Consumer):781:781 -> a
+    281:281:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
+    281:281:void addClassDefsTo(java.util.function.Consumer):781 -> a
+    282:282:void addClassDefsTo(java.util.function.Consumer):782:782 -> a
+    283:283:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
+    283:283:void addClassDefsTo(java.util.function.Consumer):782 -> a
+    284:286:void addClassDefsTo(java.util.function.Consumer):784:784 -> a
+    288:329:void addClassDefsTo(java.util.function.Consumer):786:827 -> a
+    330:351:void addClassDefsTo(java.util.function.Consumer):809:830 -> a
+    352:352:void addClassDefsTo(java.util.function.Consumer):758:758 -> a
+    353:353:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    353:353:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    353:353:void addClassDefsTo(java.util.function.Consumer):758 -> a
+    354:354:void addClassDefsTo(java.util.function.Consumer):758:758 -> a
+    355:355:long lambda$addClassDefsTo$0(java.lang.Long,com.android.tools.r8.graph.DexProgramClass):806:806 -> a
     1:2:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():462:463 -> b
     3:3:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> b
     3:3:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():463 -> b
@@ -54031,7 +54028,7 @@ com.android.tools.r8.dex.DexParser -> com.android.tools.r8.dex.r:
     9:12:com.android.tools.r8.graph.DexEncodedAnnotation parseEncodedAnnotation():319:322 -> f
     13:13:com.android.tools.r8.graph.DexEncodedArray encodedArrayAt(int):340:340 -> f
     1:1:com.android.tools.r8.graph.DexEncodedArray parseEncodedArray():336:336 -> g
-    2:8:com.android.tools.r8.dex.DexSection lookupSection(int):841:847 -> g
+    2:8:com.android.tools.r8.dex.DexSection lookupSection(int):847:853 -> g
     1:3:com.android.tools.r8.graph.DexTypeList typeListAt(int):183:185 -> h
     4:4:com.android.tools.r8.graph.DexValue[] parseEncodedArrayValues():326:326 -> h
     5:5:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> h
@@ -54095,155 +54092,155 @@ com.android.tools.r8.dex.DexParser -> com.android.tools.r8.dex.r:
     224:225:com.android.tools.r8.graph.DexValue parseEncodedValue():208:209 -> i
     226:227:com.android.tools.r8.graph.DexValue parseEncodedValue():202:203 -> i
     228:230:com.android.tools.r8.graph.DexValue parseEncodedValue():195:197 -> i
-    1:10:com.android.tools.r8.dex.DexSection[] parseMap():852:861 -> j
+    1:10:com.android.tools.r8.dex.DexSection[] parseMap():858:867 -> j
     11:11:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> j
-    11:11:com.android.tools.r8.dex.DexSection[] parseMap():861 -> j
-    12:12:com.android.tools.r8.dex.DexSection[] parseMap():874:874 -> j
-    13:16:com.android.tools.r8.dex.DexSection[] parseMap():862:865 -> j
+    11:11:com.android.tools.r8.dex.DexSection[] parseMap():867 -> j
+    12:12:com.android.tools.r8.dex.DexSection[] parseMap():880:880 -> j
+    13:16:com.android.tools.r8.dex.DexSection[] parseMap():868:871 -> j
     17:17:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> j
-    17:17:com.android.tools.r8.dex.DexSection[] parseMap():871 -> j
-    18:18:com.android.tools.r8.dex.DexSection[] parseMap():871:871 -> j
+    17:17:com.android.tools.r8.dex.DexSection[] parseMap():877 -> j
+    18:18:com.android.tools.r8.dex.DexSection[] parseMap():877:877 -> j
     19:19:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> j
-    19:19:com.android.tools.r8.dex.DexSection[] parseMap():871 -> j
-    20:30:com.android.tools.r8.dex.DexSection[] parseMap():871:881 -> j
-    31:38:com.android.tools.r8.dex.DexSection[] parseMap():880:887 -> j
+    19:19:com.android.tools.r8.dex.DexSection[] parseMap():877 -> j
+    20:30:com.android.tools.r8.dex.DexSection[] parseMap():877:887 -> j
+    31:38:com.android.tools.r8.dex.DexSection[] parseMap():886:893 -> j
     39:39:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> j
-    39:39:com.android.tools.r8.dex.DexSection[] parseMap():887 -> j
-    40:40:com.android.tools.r8.dex.DexSection[] parseMap():887:887 -> j
-    1:8:void parseStringIDs():829:836 -> k
+    39:39:com.android.tools.r8.dex.DexSection[] parseMap():893 -> j
+    40:40:com.android.tools.r8.dex.DexSection[] parseMap():893:893 -> j
+    1:8:void parseStringIDs():835:842 -> k
     1:5:com.android.tools.r8.graph.DexTypeList parseTypeList():174:178 -> l
-    1:3:void populateStrings():973:975 -> m
-    1:3:void populateIndexTables():962 -> m
-    4:6:com.android.tools.r8.graph.DexString stringAt(int):1202:1204 -> m
-    4:6:void populateStrings():975 -> m
-    4:6:void populateIndexTables():962 -> m
+    1:3:void populateStrings():979:981 -> m
+    1:3:void populateIndexTables():968 -> m
+    4:6:com.android.tools.r8.graph.DexString stringAt(int):1208:1210 -> m
+    4:6:void populateStrings():981 -> m
+    4:6:void populateIndexTables():968 -> m
     7:7:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> m
-    7:7:com.android.tools.r8.graph.DexString stringAt(int):1204 -> m
-    7:7:void populateStrings():975 -> m
-    7:7:void populateIndexTables():962 -> m
-    8:11:com.android.tools.r8.graph.DexString stringAt(int):1205:1208 -> m
-    8:11:void populateStrings():975 -> m
-    8:11:void populateIndexTables():962 -> m
+    7:7:com.android.tools.r8.graph.DexString stringAt(int):1210 -> m
+    7:7:void populateStrings():981 -> m
+    7:7:void populateIndexTables():968 -> m
+    8:11:com.android.tools.r8.graph.DexString stringAt(int):1211:1214 -> m
+    8:11:void populateStrings():981 -> m
+    8:11:void populateIndexTables():968 -> m
     12:12:byte com.android.tools.r8.dex.BinaryReader.get():97:97 -> m
-    12:12:com.android.tools.r8.graph.DexString stringAt(int):1208 -> m
-    12:12:void populateStrings():975 -> m
-    12:12:void populateIndexTables():962 -> m
-    13:15:com.android.tools.r8.graph.DexString stringAt(int):1209:1211 -> m
-    13:15:void populateStrings():975 -> m
-    13:15:void populateIndexTables():962 -> m
-    16:16:void populateStrings():975:975 -> m
-    16:16:void populateIndexTables():962 -> m
-    17:25:void populateChecksums():1008:1016 -> m
-    17:25:void populateIndexTables():963 -> m
-    26:27:void populateTypes():996:997 -> m
-    26:27:void populateIndexTables():964 -> m
-    28:47:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):1025:1044 -> m
-    28:47:void populateTypes():997 -> m
-    28:47:void populateIndexTables():964 -> m
-    48:48:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):1039:1039 -> m
-    48:48:void populateTypes():997 -> m
-    48:48:void populateIndexTables():964 -> m
-    49:51:void populateTypes():998:1000 -> m
-    49:51:void populateIndexTables():964 -> m
-    52:58:com.android.tools.r8.graph.DexType typeAt(int):1215:1221 -> m
-    52:58:void populateTypes():1001 -> m
-    52:58:void populateIndexTables():964 -> m
-    59:59:void populateTypes():1002:1002 -> m
-    59:59:void populateIndexTables():964 -> m
+    12:12:com.android.tools.r8.graph.DexString stringAt(int):1214 -> m
+    12:12:void populateStrings():981 -> m
+    12:12:void populateIndexTables():968 -> m
+    13:15:com.android.tools.r8.graph.DexString stringAt(int):1215:1217 -> m
+    13:15:void populateStrings():981 -> m
+    13:15:void populateIndexTables():968 -> m
+    16:16:void populateStrings():981:981 -> m
+    16:16:void populateIndexTables():968 -> m
+    17:25:void populateChecksums():1014:1022 -> m
+    17:25:void populateIndexTables():969 -> m
+    26:27:void populateTypes():1002:1003 -> m
+    26:27:void populateIndexTables():970 -> m
+    28:47:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):1031:1050 -> m
+    28:47:void populateTypes():1003 -> m
+    28:47:void populateIndexTables():970 -> m
+    48:48:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):1045:1045 -> m
+    48:48:void populateTypes():1003 -> m
+    48:48:void populateIndexTables():970 -> m
+    49:51:void populateTypes():1004:1006 -> m
+    49:51:void populateIndexTables():970 -> m
+    52:58:com.android.tools.r8.graph.DexType typeAt(int):1221:1227 -> m
+    52:58:void populateTypes():1007 -> m
+    52:58:void populateIndexTables():970 -> m
+    59:59:void populateTypes():1008:1008 -> m
+    59:59:void populateIndexTables():970 -> m
     60:60:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMap.getOrDefault(java.lang.Object,java.lang.Object):666:666 -> m
-    60:60:void populateTypes():1002 -> m
-    60:60:void populateIndexTables():964 -> m
-    61:62:void populateTypes():1002:1003 -> m
-    61:62:void populateIndexTables():964 -> m
-    63:64:void populateFields():1053:1054 -> m
-    63:64:void populateIndexTables():965 -> m
-    65:100:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1069:1104 -> m
-    65:100:void populateFields():1054 -> m
-    65:100:void populateIndexTables():965 -> m
-    101:111:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1101:1111 -> m
-    101:111:void populateFields():1054 -> m
-    101:111:void populateIndexTables():965 -> m
-    112:116:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1108:1112 -> m
-    112:116:void populateFields():1054 -> m
-    112:116:void populateIndexTables():965 -> m
-    117:117:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1097:1097 -> m
-    117:117:void populateFields():1054 -> m
-    117:117:void populateIndexTables():965 -> m
-    118:120:void populateFields():1055:1057 -> m
-    118:120:void populateIndexTables():965 -> m
-    121:133:com.android.tools.r8.graph.DexField fieldAt(int):1225:1237 -> m
-    121:133:void populateFields():1057 -> m
-    121:133:void populateIndexTables():965 -> m
-    134:134:void populateFields():1057:1057 -> m
-    134:134:void populateIndexTables():965 -> m
-    135:138:void populateProtos():1123:1126 -> m
-    135:138:void populateIndexTables():966 -> m
-    139:151:com.android.tools.r8.graph.DexProto protoAt(int):1298:1310 -> m
-    139:151:void populateProtos():1126 -> m
-    139:151:void populateIndexTables():966 -> m
-    152:152:void populateProtos():1126:1126 -> m
-    152:152:void populateIndexTables():966 -> m
-    153:154:void populateMethods():1131:1132 -> m
-    153:154:void populateIndexTables():967 -> m
-    155:190:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1148:1183 -> m
-    155:190:void populateMethods():1132 -> m
-    155:190:void populateIndexTables():967 -> m
-    191:201:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1180:1190 -> m
-    191:201:void populateMethods():1132 -> m
-    191:201:void populateIndexTables():967 -> m
-    202:206:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1187:1191 -> m
-    202:206:void populateMethods():1132 -> m
-    202:206:void populateIndexTables():967 -> m
-    207:207:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1176:1176 -> m
-    207:207:void populateMethods():1132 -> m
-    207:207:void populateIndexTables():967 -> m
-    208:210:void populateMethods():1133:1135 -> m
-    208:210:void populateIndexTables():967 -> m
-    211:223:com.android.tools.r8.graph.DexMethod methodAt(int):1314:1326 -> m
-    211:223:void populateMethods():1135 -> m
-    211:223:void populateIndexTables():967 -> m
-    224:224:com.android.tools.r8.graph.DexMethod methodAt(int):1323:1323 -> m
-    224:224:void populateMethods():1135 -> m
-    224:224:void populateIndexTables():967 -> m
-    225:225:void populateMethods():1135:1135 -> m
-    225:225:void populateIndexTables():967 -> m
-    226:229:void populateMethodHandles():980:983 -> m
-    226:229:void populateIndexTables():968 -> m
-    230:257:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1241:1268 -> m
-    230:257:void populateMethodHandles():983 -> m
-    230:257:void populateIndexTables():968 -> m
-    258:258:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1264:1264 -> m
-    258:258:void populateMethodHandles():983 -> m
-    258:258:void populateIndexTables():968 -> m
-    259:275:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1256:1272 -> m
-    259:275:void populateMethodHandles():983 -> m
-    259:275:void populateIndexTables():968 -> m
-    276:276:void populateMethodHandles():983:983 -> m
-    276:276:void populateIndexTables():968 -> m
-    277:280:void populateCallSites():988:991 -> m
-    277:280:void populateIndexTables():969 -> m
-    281:289:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1277:1285 -> m
-    281:289:void populateCallSites():991 -> m
-    281:289:void populateIndexTables():969 -> m
+    60:60:void populateTypes():1008 -> m
+    60:60:void populateIndexTables():970 -> m
+    61:62:void populateTypes():1008:1009 -> m
+    61:62:void populateIndexTables():970 -> m
+    63:64:void populateFields():1059:1060 -> m
+    63:64:void populateIndexTables():971 -> m
+    65:100:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1075:1110 -> m
+    65:100:void populateFields():1060 -> m
+    65:100:void populateIndexTables():971 -> m
+    101:111:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1107:1117 -> m
+    101:111:void populateFields():1060 -> m
+    101:111:void populateIndexTables():971 -> m
+    112:116:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1114:1118 -> m
+    112:116:void populateFields():1060 -> m
+    112:116:void populateIndexTables():971 -> m
+    117:117:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1103:1103 -> m
+    117:117:void populateFields():1060 -> m
+    117:117:void populateIndexTables():971 -> m
+    118:120:void populateFields():1061:1063 -> m
+    118:120:void populateIndexTables():971 -> m
+    121:133:com.android.tools.r8.graph.DexField fieldAt(int):1231:1243 -> m
+    121:133:void populateFields():1063 -> m
+    121:133:void populateIndexTables():971 -> m
+    134:134:void populateFields():1063:1063 -> m
+    134:134:void populateIndexTables():971 -> m
+    135:138:void populateProtos():1129:1132 -> m
+    135:138:void populateIndexTables():972 -> m
+    139:151:com.android.tools.r8.graph.DexProto protoAt(int):1304:1316 -> m
+    139:151:void populateProtos():1132 -> m
+    139:151:void populateIndexTables():972 -> m
+    152:152:void populateProtos():1132:1132 -> m
+    152:152:void populateIndexTables():972 -> m
+    153:154:void populateMethods():1137:1138 -> m
+    153:154:void populateIndexTables():973 -> m
+    155:190:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1154:1189 -> m
+    155:190:void populateMethods():1138 -> m
+    155:190:void populateIndexTables():973 -> m
+    191:201:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1186:1196 -> m
+    191:201:void populateMethods():1138 -> m
+    191:201:void populateIndexTables():973 -> m
+    202:206:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1193:1197 -> m
+    202:206:void populateMethods():1138 -> m
+    202:206:void populateIndexTables():973 -> m
+    207:207:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1182:1182 -> m
+    207:207:void populateMethods():1138 -> m
+    207:207:void populateIndexTables():973 -> m
+    208:210:void populateMethods():1139:1141 -> m
+    208:210:void populateIndexTables():973 -> m
+    211:223:com.android.tools.r8.graph.DexMethod methodAt(int):1320:1332 -> m
+    211:223:void populateMethods():1141 -> m
+    211:223:void populateIndexTables():973 -> m
+    224:224:com.android.tools.r8.graph.DexMethod methodAt(int):1329:1329 -> m
+    224:224:void populateMethods():1141 -> m
+    224:224:void populateIndexTables():973 -> m
+    225:225:void populateMethods():1141:1141 -> m
+    225:225:void populateIndexTables():973 -> m
+    226:229:void populateMethodHandles():986:989 -> m
+    226:229:void populateIndexTables():974 -> m
+    230:257:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1247:1274 -> m
+    230:257:void populateMethodHandles():989 -> m
+    230:257:void populateIndexTables():974 -> m
+    258:258:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1270:1270 -> m
+    258:258:void populateMethodHandles():989 -> m
+    258:258:void populateIndexTables():974 -> m
+    259:275:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1262:1278 -> m
+    259:275:void populateMethodHandles():989 -> m
+    259:275:void populateIndexTables():974 -> m
+    276:276:void populateMethodHandles():989:989 -> m
+    276:276:void populateIndexTables():974 -> m
+    277:280:void populateCallSites():994:997 -> m
+    277:280:void populateIndexTables():975 -> m
+    281:289:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1283:1291 -> m
+    281:289:void populateCallSites():997 -> m
+    281:289:void populateIndexTables():975 -> m
     290:290:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> m
-    290:290:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1285 -> m
-    290:290:void populateCallSites():991 -> m
-    290:290:void populateIndexTables():969 -> m
-    291:293:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1285:1287 -> m
-    291:293:void populateCallSites():991 -> m
-    291:293:void populateIndexTables():969 -> m
+    290:290:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1291 -> m
+    290:290:void populateCallSites():997 -> m
+    290:290:void populateIndexTables():975 -> m
+    291:293:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1291:1293 -> m
+    291:293:void populateCallSites():997 -> m
+    291:293:void populateIndexTables():975 -> m
     294:294:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodType():0:0 -> m
-    294:294:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1287 -> m
-    294:294:void populateCallSites():991 -> m
-    294:294:void populateIndexTables():969 -> m
-    295:302:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1287:1294 -> m
-    295:302:void populateCallSites():991 -> m
-    295:302:void populateIndexTables():969 -> m
-    303:303:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1289:1289 -> m
-    303:303:void populateCallSites():991 -> m
-    303:303:void populateIndexTables():969 -> m
-    304:304:void populateCallSites():991:991 -> m
-    304:304:void populateIndexTables():969 -> m
+    294:294:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1293 -> m
+    294:294:void populateCallSites():997 -> m
+    294:294:void populateIndexTables():975 -> m
+    295:302:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1293:1300 -> m
+    295:302:void populateCallSites():997 -> m
+    295:302:void populateIndexTables():975 -> m
+    303:303:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1295:1295 -> m
+    303:303:void populateCallSites():997 -> m
+    303:303:void populateIndexTables():975 -> m
+    304:304:void populateCallSites():997:997 -> m
+    304:304:void populateIndexTables():975 -> m
 com.android.tools.r8.dex.DexParser$1 -> com.android.tools.r8.dex.n:
 com.android.tools.r8.dex.DexParser$AnnotationsDirectory -> com.android.tools.r8.dex.o:
     com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] NO_METHOD_ANNOTATIONS -> g
@@ -54254,9 +54251,9 @@ com.android.tools.r8.dex.DexParser$AnnotationsDirectory -> com.android.tools.r8.
     com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] methods -> c
     com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[] parameters -> d
     com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[] NO_FIELD_ANNOTATIONS -> f
-    1:11:void <clinit>():1331:1341 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[]):1353:1357 -> <init>
-    1:1:com.android.tools.r8.dex.DexParser$AnnotationsDirectory empty():1361:1361 -> a
+    1:11:void <clinit>():1337:1347 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[]):1359:1363 -> <init>
+    1:1:com.android.tools.r8.dex.DexParser$AnnotationsDirectory empty():1367:1367 -> a
 com.android.tools.r8.dex.DexParser$AttributesAndAnnotations -> com.android.tools.r8.dex.p:
     com.android.tools.r8.graph.EnclosingMethodAttribute enclosingMethodAttribute -> b
     java.util.List lazyAnnotations -> d
@@ -54264,18 +54261,18 @@ com.android.tools.r8.dex.DexParser$AttributesAndAnnotations -> com.android.tools
     java.util.List innerClasses -> c
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.GenericSignature$ClassSignature classSignature -> e
-    1:1:void <clinit>():1365:1365 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1396:1396 -> <init>
-    2:53:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1368:1419 -> <init>
-    54:70:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1418:1434 -> <init>
-    71:108:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1433:1470 -> <init>
-    109:124:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1465:1480 -> <init>
-    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature access$100(com.android.tools.r8.dex.DexParser$AttributesAndAnnotations):1365:1365 -> a
-    2:8:com.android.tools.r8.graph.DexAnnotationSet getAnnotations():1374:1380 -> a
-    9:11:void ensureAnnotations(int):1486:1488 -> a
-    12:13:void copyAnnotation(com.android.tools.r8.graph.DexAnnotation):1493:1494 -> a
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():1388:1388 -> b
-    1:1:java.util.List getInnerClasses():1384:1384 -> c
+    1:1:void <clinit>():1371:1371 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1402:1402 -> <init>
+    2:53:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1374:1425 -> <init>
+    54:70:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1424:1440 -> <init>
+    71:108:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1439:1476 -> <init>
+    109:124:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1471:1486 -> <init>
+    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature access$100(com.android.tools.r8.dex.DexParser$AttributesAndAnnotations):1371:1371 -> a
+    2:8:com.android.tools.r8.graph.DexAnnotationSet getAnnotations():1380:1386 -> a
+    9:11:void ensureAnnotations(int):1492:1494 -> a
+    12:13:void copyAnnotation(com.android.tools.r8.graph.DexAnnotation):1499:1500 -> a
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():1394:1394 -> b
+    1:1:java.util.List getInnerClasses():1390:1390 -> c
 com.android.tools.r8.dex.DexParser$MemberAnnotationIterator -> com.android.tools.r8.dex.q:
     java.util.function.Supplier emptyValue -> c
     com.android.tools.r8.graph.DexMemberAnnotation[] annotations -> b
@@ -54310,7 +54307,7 @@ com.android.tools.r8.dex.DexReader -> com.android.tools.r8.dex.s:
     8:8:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> h
     8:8:void setByteOrder():98 -> h
     9:9:void setByteOrder():98:98 -> h
-com.android.tools.r8.dex.DexSection -> com.android.tools.r8.internal.rM0:
+com.android.tools.r8.dex.DexSection -> com.android.tools.r8.internal.uM0:
     int length -> b
     int offset -> c
     int type -> a
@@ -54497,7 +54494,7 @@ com.android.tools.r8.dex.FileWriter -> com.android.tools.r8.dex.y:
     299:300:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):744:745 -> a
     301:307:int writeMapItem(int,int,int):753:759 -> a
     308:308:void checkThatInvokeCustomIsAllowed():1400:1400 -> a
-    309:309:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    309:309:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     309:309:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokeCustom():1711 -> a
     309:309:void checkThatInvokeCustomIsAllowed():1400 -> a
     310:310:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokeCustom():1711:1711 -> a
@@ -54765,7 +54762,7 @@ com.android.tools.r8.dex.FileWriter$ProgramClassDependencyCollector -> com.andro
     1:2:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1379:1380 -> <init>
     3:7:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1377:1381 -> <init>
     1:4:void visit(com.android.tools.r8.graph.DexClass):1392:1395 -> b
-com.android.tools.r8.dex.IndexedItemCollection -> com.android.tools.r8.internal.pT0:
+com.android.tools.r8.dex.IndexedItemCollection -> com.android.tools.r8.internal.sT0:
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> a
     boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle) -> a
     boolean addProto(com.android.tools.r8.graph.DexProto) -> a
@@ -54958,7 +54955,7 @@ com.android.tools.r8.dex.InheritanceClassInDexDistributor$DirectSubClassesInfo -
     2:5:void addDirectSubClass(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):274:277 -> a
     6:7:java.util.Collection getDirectSubClasses(com.android.tools.r8.graph.DexProgramClass):262:263 -> a
     1:1:java.util.Collection lambda$addDirectSubClass$0(com.android.tools.r8.graph.DexProgramClass):276:276 -> b
-com.android.tools.r8.dex.JumboStringRewriter -> com.android.tools.r8.internal.ZY0:
+com.android.tools.r8.dex.JumboStringRewriter -> com.android.tools.r8.internal.cZ0:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.DexString firstJumboString -> b
     java.util.Map instructionTargets -> d
@@ -55030,10 +55027,10 @@ com.android.tools.r8.dex.JumboStringRewriter -> com.android.tools.r8.internal.ZY
     407:417:com.android.tools.r8.graph.DexCode rewrite():121 -> a
     418:430:com.android.tools.r8.graph.DexCode rewrite():123:135 -> a
     com.android.tools.r8.code.Instruction lambda$replaceTarget$1(com.android.tools.r8.code.Instruction,com.android.tools.r8.code.Instruction,com.android.tools.r8.code.Instruction) -> b
-com.android.tools.r8.dex.JumboStringRewriter$1 -> com.android.tools.r8.internal.XY0:
+com.android.tools.r8.dex.JumboStringRewriter$1 -> com.android.tools.r8.internal.aZ0:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():297:297 -> <clinit>
-com.android.tools.r8.dex.JumboStringRewriter$TryTargets -> com.android.tools.r8.internal.YY0:
+com.android.tools.r8.dex.JumboStringRewriter$TryTargets -> com.android.tools.r8.internal.bZ0:
     com.android.tools.r8.code.Instruction start -> a
     com.android.tools.r8.code.Instruction end -> b
     boolean endsAfterLastInstruction -> c
@@ -55043,7 +55040,7 @@ com.android.tools.r8.dex.JumboStringRewriter$TryTargets -> com.android.tools.r8.
     1:5:void replaceTarget(com.android.tools.r8.code.Instruction,com.android.tools.r8.code.Instruction):71:75 -> a
     6:6:int getStartOffset():80:80 -> a
     1:4:int getStartToEndDelta():84:87 -> b
-com.android.tools.r8.dex.Marker -> com.android.tools.r8.internal.K61:
+com.android.tools.r8.dex.Marker -> com.android.tools.r8.internal.N61:
     com.android.tools.r8.dex.Marker$Tool tool -> b
     boolean $assertionsDisabled -> f
     java.lang.String D8_PREFIX -> c
@@ -55098,12 +55095,12 @@ com.android.tools.r8.dex.Marker -> com.android.tools.r8.internal.K61:
     1:1:boolean isL8():131:131 -> o
     1:1:boolean isRelocator():135:135 -> p
     1:5:java.lang.String toString():273:277 -> toString
-com.android.tools.r8.dex.Marker$Backend$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.J61:
+com.android.tools.r8.dex.Marker$Backend$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.M61:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String name(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.dex.Marker$Tool -> com.android.tools.r8.internal.K61$a:
+com.android.tools.r8.dex.Marker$Tool -> com.android.tools.r8.internal.N61$a:
     com.android.tools.r8.dex.Marker$Tool R8 -> b
     com.android.tools.r8.dex.Marker$Tool D8 -> a
     com.android.tools.r8.dex.Marker$Tool Relocator -> d
@@ -55111,7 +55108,7 @@ com.android.tools.r8.dex.Marker$Tool -> com.android.tools.r8.internal.K61$a:
     1:4:void <clinit>():36:39 -> <clinit>
     1:1:void <init>(java.lang.String,int):35:35 -> <init>
     1:1:com.android.tools.r8.dex.Marker$Tool[] valuesR8andD8():42:42 -> a
-com.android.tools.r8.dex.MethodToCodeObjectMapping -> com.android.tools.r8.internal.S71:
+com.android.tools.r8.dex.MethodToCodeObjectMapping -> com.android.tools.r8.internal.V71:
     1:1:void <init>():12:12 -> <init>
     void clearCode(com.android.tools.r8.graph.DexEncodedMethod) -> a
     boolean verifyCodeObjects(java.util.Collection) -> a
@@ -55147,7 +55144,7 @@ com.android.tools.r8.dex.MixedSectionCollection -> com.android.tools.r8.dex.F:
     1:1:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
     1:1:void visit(com.android.tools.r8.graph.DexEncodedMethod):63 -> a
     2:2:void visit(com.android.tools.r8.graph.DexEncodedMethod):62:62 -> a
-com.android.tools.r8.dex.ResourceAdapter -> com.android.tools.r8.internal.sl1:
+com.android.tools.r8.dex.ResourceAdapter -> com.android.tools.r8.internal.ql1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> e
@@ -55176,14 +55173,14 @@ com.android.tools.r8.dex.ResourceAdapter -> com.android.tools.r8.internal.sl1:
     1:1:com.android.tools.r8.graph.GraphLens access$100(com.android.tools.r8.dex.ResourceAdapter):32:32 -> b
     1:1:com.android.tools.r8.naming.NamingLens access$200(com.android.tools.r8.dex.ResourceAdapter):32:32 -> c
     1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.dex.ResourceAdapter):32:32 -> d
-com.android.tools.r8.dex.ResourceAdapter$DefaultFileNameAdapter -> com.android.tools.r8.internal.ml1:
+com.android.tools.r8.dex.ResourceAdapter$DefaultFileNameAdapter -> com.android.tools.r8.internal.kl1:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):420:420 -> <init>
     1:1:boolean com.android.tools.r8.dex.ResourceAdapter$StringAdapter.eof(int):347:347 -> b
     1:1:boolean isRenamingCandidate(int,int):425 -> b
-com.android.tools.r8.dex.ResourceAdapter$DirectoryNameAdapter -> com.android.tools.r8.internal.nl1:
+com.android.tools.r8.dex.ResourceAdapter$DirectoryNameAdapter -> com.android.tools.r8.internal.ll1:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):452:452 -> <init>
     boolean isRenamingCandidate(int,int) -> b
-com.android.tools.r8.dex.ResourceAdapter$FileContentsAdapter -> com.android.tools.r8.internal.ol1:
+com.android.tools.r8.dex.ResourceAdapter$FileContentsAdapter -> com.android.tools.r8.internal.ml1:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):354:354 -> <init>
     boolean allowRenamingOfPrefixes() -> a
     1:1:boolean shouldRecordPrefix(char):369:369 -> a
@@ -55193,7 +55190,7 @@ com.android.tools.r8.dex.ResourceAdapter$FileContentsAdapter -> com.android.tool
     2:2:boolean com.android.tools.r8.dex.ResourceAdapter$StringAdapter.eof(int):347:347 -> b
     2:2:boolean isRenamingCandidate(int,int):381 -> b
     3:3:boolean isRenamingCandidate(int,int):381:381 -> b
-com.android.tools.r8.dex.ResourceAdapter$FileNameAdapter -> com.android.tools.r8.internal.pl1:
+com.android.tools.r8.dex.ResourceAdapter$FileNameAdapter -> com.android.tools.r8.internal.nl1:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):391:391 -> <init>
     boolean allowRenamingOfPrefixes() -> a
     1:1:boolean com.android.tools.r8.dex.ResourceAdapter$StringAdapter.eof(int):347:347 -> a
@@ -55202,12 +55199,12 @@ com.android.tools.r8.dex.ResourceAdapter$FileNameAdapter -> com.android.tools.r8
     6:6:boolean handlePrefix(int,int):412:412 -> a
     7:7:boolean shouldRecordPrefix(char):406:406 -> a
     char getClassNameSeparator() -> b
-com.android.tools.r8.dex.ResourceAdapter$ServiceFileNameAdapter -> com.android.tools.r8.internal.ql1:
+com.android.tools.r8.dex.ResourceAdapter$ServiceFileNameAdapter -> com.android.tools.r8.internal.ol1:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):431:431 -> <init>
     char getClassNameSeparator() -> b
     1:1:boolean com.android.tools.r8.dex.ResourceAdapter$StringAdapter.eof(int):347:347 -> b
     1:1:boolean isRenamingCandidate(int,int):446 -> b
-com.android.tools.r8.dex.ResourceAdapter$StringAdapter -> com.android.tools.r8.internal.rl1:
+com.android.tools.r8.dex.ResourceAdapter$StringAdapter -> com.android.tools.r8.internal.pl1:
     java.lang.StringBuilder result -> b
     java.lang.String contents -> a
     int outputFrom -> d
@@ -55616,7 +55613,7 @@ com.android.tools.r8.dexsplitter.DexSplitter -> com.android.tools.r8.dexsplitter
     68:89:void splitNonClassResources(com.android.tools.r8.dexsplitter.DexSplitter$Options,com.android.tools.r8.utils.FeatureClassMapping):329:350 -> run
     68:89:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):322 -> run
     90:90:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):300:300 -> run
-com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar -> com.android.tools.r8.internal.tM0:
+com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar -> com.android.tools.r8.internal.wM0:
     java.lang.String jar -> a
     java.lang.String outputName -> b
     1:3:void <init>(java.lang.String,java.lang.String):49:51 -> <init>
@@ -55757,33 +55754,33 @@ com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl$Builder ->
     2:3:boolean validate():54:55 -> d
     2:3:com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl build():48 -> d
     4:4:com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl build():49:49 -> d
-com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl -> com.android.tools.r8.internal.Z71:
+com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl -> com.android.tools.r8.internal.c81:
     com.android.tools.r8.references.ClassReference classReference -> b
     1:1:void <init>(com.android.tools.r8.references.ClassReference,java.util.Collection,com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$1):13:13 -> <init>
     2:3:void <init>(com.android.tools.r8.references.ClassReference,java.util.Collection):19:20 -> <init>
     1:1:com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$Builder builder():24:24 -> a
     1:1:com.android.tools.r8.references.ClassReference getClassReference():29:29 -> getClassReference
-com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$1 -> com.android.tools.r8.internal.X71:
-com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$Builder -> com.android.tools.r8.internal.Y71:
+com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$1 -> com.android.tools.r8.internal.a81:
+com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$Builder -> com.android.tools.r8.internal.b81:
     com.android.tools.r8.references.ClassReference classReference -> b
     1:1:void <init>(com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$1):32:32 -> <init>
     2:2:void <init>():36:36 -> <init>
     com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder self() -> a
     1:1:com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$Builder setClass(com.android.tools.r8.references.ClassReference):39:39 -> a
     1:1:com.android.tools.r8.diagnostic.MissingDefinitionInfo build():44:44 -> b
-com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase -> com.android.tools.r8.internal.e81:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase -> com.android.tools.r8.internal.h81:
     java.util.Collection referencedFromContexts -> a
     1:2:void <init>(java.util.Collection):16:17 -> <init>
     1:3:java.lang.String getDiagnosticMessage():22:24 -> getDiagnosticMessage
     1:1:java.util.Collection getReferencedFromContexts():29:29 -> getReferencedFromContexts
-com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder -> com.android.tools.r8.internal.d81:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder -> com.android.tools.r8.internal.g81:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder referencedFromContextsBuilder -> a
     1:1:void <init>():37:37 -> <init>
     2:2:void <init>():35:35 -> <init>
     com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder self() -> a
     1:2:com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder addReferencedFromContext(com.android.tools.r8.diagnostic.DefinitionContext):40:41 -> a
     3:4:com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder addReferencedFromContexts(java.lang.Iterable):45:46 -> a
-com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoUtils -> com.android.tools.r8.internal.f81:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoUtils -> com.android.tools.r8.internal.i81:
     boolean $assertionsDisabled -> b
     java.util.Comparator COMPARATOR -> a
     1:3:void <clinit>():26:28 -> <clinit>
@@ -55831,7 +55828,7 @@ com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoUtils -> com.andro
     1:23:void writeReferencedFromSuffix(java.lang.StringBuilder,com.android.tools.r8.diagnostic.MissingDefinitionInfo):110:132 -> b
     24:28:void writeReferencedFromSuffix(java.lang.StringBuilder,com.android.tools.r8.diagnostic.MissingDefinitionInfo):131:135 -> b
     29:32:void writeReferencedFromSuffix(java.lang.StringBuilder,com.android.tools.r8.diagnostic.MissingDefinitionInfo):134:137 -> b
-com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl -> com.android.tools.r8.internal.i81:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl -> com.android.tools.r8.internal.l81:
     java.util.Collection missingDefinitions -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():17:17 -> <clinit>
@@ -55848,36 +55845,36 @@ com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl -> com
     1:3:java.util.Collection getMissingDefinitions():32 -> getMissingDefinitions
     1:1:com.android.tools.r8.origin.Origin getOrigin():45:45 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():51:51 -> getPosition
-com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$1 -> com.android.tools.r8.internal.g81:
-com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$Builder -> com.android.tools.r8.internal.h81:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$1 -> com.android.tools.r8.internal.j81:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$Builder -> com.android.tools.r8.internal.k81:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder missingDefinitionsBuilder -> a
     1:1:void <init>(com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$1):75:75 -> <init>
     2:2:void <init>():80:80 -> <init>
     3:3:void <init>():78:78 -> <init>
     1:1:com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$Builder addMissingDefinitionInfo(com.android.tools.r8.diagnostic.MissingDefinitionInfo):83:83 -> a
     2:2:com.android.tools.r8.diagnostic.MissingDefinitionsDiagnostic build():88:88 -> a
-com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl -> com.android.tools.r8.internal.l81:
+com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl -> com.android.tools.r8.internal.o81:
     com.android.tools.r8.references.FieldReference fieldReference -> b
     1:1:void <init>(com.android.tools.r8.references.FieldReference,java.util.Collection,com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$1):13:13 -> <init>
     2:3:void <init>(com.android.tools.r8.references.FieldReference,java.util.Collection):19:20 -> <init>
     1:1:com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$Builder builder():24:24 -> a
     1:1:com.android.tools.r8.references.FieldReference getFieldReference():29:29 -> getFieldReference
-com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$1 -> com.android.tools.r8.internal.j81:
-com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$Builder -> com.android.tools.r8.internal.k81:
+com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$1 -> com.android.tools.r8.internal.m81:
+com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$Builder -> com.android.tools.r8.internal.n81:
     com.android.tools.r8.references.FieldReference fieldReference -> b
     1:1:void <init>(com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$1):32:32 -> <init>
     2:2:void <init>():36:36 -> <init>
     com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder self() -> a
     1:1:com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$Builder setField(com.android.tools.r8.references.FieldReference):39:39 -> a
     1:1:com.android.tools.r8.diagnostic.MissingDefinitionInfo build():44:44 -> b
-com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl -> com.android.tools.r8.internal.o81:
+com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl -> com.android.tools.r8.internal.r81:
     com.android.tools.r8.references.MethodReference methodReference -> b
     1:1:void <init>(com.android.tools.r8.references.MethodReference,java.util.Collection,com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$1):13:13 -> <init>
     2:3:void <init>(com.android.tools.r8.references.MethodReference,java.util.Collection):19:20 -> <init>
     1:1:com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$Builder builder():24:24 -> a
     1:1:com.android.tools.r8.references.MethodReference getMethodReference():29:29 -> getMethodReference
-com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$1 -> com.android.tools.r8.internal.m81:
-com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$Builder -> com.android.tools.r8.internal.n81:
+com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$1 -> com.android.tools.r8.internal.p81:
+com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$Builder -> com.android.tools.r8.internal.q81:
     com.android.tools.r8.references.MethodReference methodReference -> b
     1:1:void <init>(com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$1):32:32 -> <init>
     2:2:void <init>():36:36 -> <init>
@@ -55943,7 +55940,7 @@ com.android.tools.r8.errors.CodeSizeOverflowDiagnostic -> com.android.tools.r8.e
     1:1:int getCodeSize():32:32 -> getCodeSize
     1:5:java.lang.String getDiagnosticMessage():42:46 -> getDiagnosticMessage
     1:1:com.android.tools.r8.position.Position getPosition():37:37 -> getPosition
-com.android.tools.r8.errors.CompilationError -> com.android.tools.r8.internal.XI0:
+com.android.tools.r8.errors.CompilationError -> com.android.tools.r8.internal.aJ0:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.Position position -> b
     1:1:void <init>(java.lang.String):22:22 -> <init>
@@ -55960,14 +55957,14 @@ com.android.tools.r8.errors.ConstantPoolOverflowDiagnostic -> com.android.tools.
     1:3:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.references.ClassReference,int):21:23 -> <init>
     1:1:int getConstantPoolSize():28:28 -> getConstantPoolSize
     1:5:java.lang.String getDiagnosticMessage():33:37 -> getDiagnosticMessage
-com.android.tools.r8.errors.DefaultInterfaceMethodDiagnostic -> com.android.tools.r8.internal.vK0:
+com.android.tools.r8.errors.DefaultInterfaceMethodDiagnostic -> com.android.tools.r8.internal.yK0:
     com.android.tools.r8.position.MethodPosition position -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():11:11 -> <clinit>
     1:3:void <init>(com.android.tools.r8.position.MethodPosition):15:17 -> <init>
     1:3:java.lang.String getDiagnosticMessage():27:27 -> getDiagnosticMessage
     1:1:com.android.tools.r8.position.Position getPosition():22:22 -> getPosition
-com.android.tools.r8.errors.DesugaredLibraryMismatchDiagnostic -> com.android.tools.r8.internal.aL0:
+com.android.tools.r8.errors.DesugaredLibraryMismatchDiagnostic -> com.android.tools.r8.internal.dL0:
     java.util.Set desugaredLibraryIdentifiers -> a
     java.util.Set markers -> b
     1:3:void <init>(java.util.Set,java.util.Set):20:22 -> <init>
@@ -55995,7 +55992,7 @@ com.android.tools.r8.errors.DuplicateTypesDiagnostic -> com.android.tools.r8.err
     1:1:java.util.Collection getOrigins():43:43 -> getOrigins
     1:1:com.android.tools.r8.position.Position getPosition():61:61 -> getPosition
     1:1:com.android.tools.r8.references.ClassReference getType():30:30 -> getType
-com.android.tools.r8.errors.ExperimentalClassFileVersionDiagnostic -> com.android.tools.r8.internal.rO0:
+com.android.tools.r8.errors.ExperimentalClassFileVersionDiagnostic -> com.android.tools.r8.internal.uO0:
     com.android.tools.r8.origin.Origin origin -> b
     java.lang.String message -> a
     1:3:void <init>(com.android.tools.r8.origin.Origin,java.lang.String):16:18 -> <init>
@@ -56018,14 +56015,14 @@ com.android.tools.r8.errors.InterfaceDesugarMissingTypeDiagnostic -> com.android
     1:1:com.android.tools.r8.references.ClassReference getMissingType():58:58 -> getMissingType
     1:1:com.android.tools.r8.origin.Origin getOrigin():47:47 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():53:53 -> getPosition
-com.android.tools.r8.errors.InternalCompilerError -> com.android.tools.r8.internal.sX0:
+com.android.tools.r8.errors.InternalCompilerError -> com.android.tools.r8.internal.vX0:
     1:1:void <init>():17:17 -> <init>
     2:2:void <init>(java.lang.String):21:21 -> <init>
     3:3:void <init>(java.lang.String,java.lang.Throwable):25:25 -> <init>
     4:4:void <init>(java.lang.Throwable):29:29 -> <init>
-com.android.tools.r8.errors.InvalidDebugInfoException -> com.android.tools.r8.internal.JX0:
+com.android.tools.r8.errors.InvalidDebugInfoException -> com.android.tools.r8.internal.MX0:
     1:1:void <init>(java.lang.String):9:9 -> <init>
-com.android.tools.r8.errors.InvalidDescriptorException -> com.android.tools.r8.internal.KX0:
+com.android.tools.r8.errors.InvalidDescriptorException -> com.android.tools.r8.internal.NX0:
     1:1:void <init>(java.lang.String):8:8 -> <init>
 com.android.tools.r8.errors.InvalidLibrarySuperclassDiagnostic -> com.android.tools.r8.errors.InvalidLibrarySuperclassDiagnostic:
     java.util.List methods -> b
@@ -56039,7 +56036,7 @@ com.android.tools.r8.errors.InvalidLibrarySuperclassDiagnostic -> com.android.to
     1:13:java.lang.String getDiagnosticMessage():57:69 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():47:47 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():52:52 -> getPosition
-com.android.tools.r8.errors.InvokeCustomDiagnostic -> com.android.tools.r8.internal.PX0:
+com.android.tools.r8.errors.InvokeCustomDiagnostic -> com.android.tools.r8.internal.SX0:
     1:1:void <init>():9:9 -> <init>
     1:1:java.lang.String getDiagnosticMessage():13:13 -> getDiagnosticMessage
 com.android.tools.r8.errors.MissingNestHostNestDesugarDiagnostic -> com.android.tools.r8.errors.MissingNestHostNestDesugarDiagnostic:
@@ -56052,24 +56049,24 @@ com.android.tools.r8.errors.NestDesugarDiagnostic -> com.android.tools.r8.errors
     1:1:java.lang.String getDiagnosticMessage():36:36 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():26:26 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():31:31 -> getPosition
-com.android.tools.r8.errors.PrivateInterfaceMethodDiagnostic -> com.android.tools.r8.internal.kf1:
+com.android.tools.r8.errors.PrivateInterfaceMethodDiagnostic -> com.android.tools.r8.internal.nf1:
     com.android.tools.r8.position.MethodPosition position -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():11:11 -> <clinit>
     1:3:void <init>(com.android.tools.r8.position.MethodPosition):15:17 -> <init>
     1:3:java.lang.String getDiagnosticMessage():27:27 -> getDiagnosticMessage
     1:1:com.android.tools.r8.position.Position getPosition():22:22 -> getPosition
-com.android.tools.r8.errors.StaticInterfaceMethodDiagnostic -> com.android.tools.r8.internal.yo1:
+com.android.tools.r8.errors.StaticInterfaceMethodDiagnostic -> com.android.tools.r8.internal.qo1:
     com.android.tools.r8.position.MethodPosition position -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():11:11 -> <clinit>
     1:3:void <init>(com.android.tools.r8.position.MethodPosition):15:17 -> <init>
     1:3:java.lang.String getDiagnosticMessage():27:27 -> getDiagnosticMessage
     1:1:com.android.tools.r8.position.Position getPosition():22:22 -> getPosition
-com.android.tools.r8.errors.Unimplemented -> com.android.tools.r8.internal.Or1:
+com.android.tools.r8.errors.Unimplemented -> com.android.tools.r8.internal.Gr1:
     1:1:void <init>():11:11 -> <init>
     2:2:void <init>(java.lang.String):15:15 -> <init>
-com.android.tools.r8.errors.Unreachable -> com.android.tools.r8.internal.hs1:
+com.android.tools.r8.errors.Unreachable -> com.android.tools.r8.internal.Zr1:
     1:1:void <init>():19:19 -> <init>
     2:2:void <init>(java.lang.String):23:23 -> <init>
     3:3:void <init>(java.lang.Throwable):27:27 -> <init>
@@ -56079,22 +56076,22 @@ com.android.tools.r8.errors.UnsupportedMainDexListUsageDiagnostic -> com.android
     1:1:java.lang.String getDiagnosticMessage():36:36 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():26:26 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():31:31 -> getPosition
-com.android.tools.r8.errors.dontwarn.DontWarnConfiguration -> com.android.tools.r8.internal.KM0:
+com.android.tools.r8.errors.dontwarn.DontWarnConfiguration -> com.android.tools.r8.internal.NM0:
     1:1:void <init>():12:12 -> <init>
     boolean matches(com.android.tools.r8.graph.DexType) -> a
     boolean validate(com.android.tools.r8.utils.InternalOptions) -> a
     1:3:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration create(com.android.tools.r8.shaking.ProguardConfiguration):15:17 -> a
     4:4:com.android.tools.r8.errors.dontwarn.EmptyDontWarnConfiguration com.android.tools.r8.errors.dontwarn.DontWarnConfiguration.empty():23:23 -> a
     4:4:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration create(com.android.tools.r8.shaking.ProguardConfiguration):19 -> a
-com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$1 -> com.android.tools.r8.internal.IM0:
-com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$Witness -> com.android.tools.r8.internal.JM0:
+com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$1 -> com.android.tools.r8.internal.LM0:
+com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$Witness -> com.android.tools.r8.internal.MM0:
     1:1:void <init>(com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$1):36:36 -> <init>
     2:2:void <init>():38:38 -> <init>
-com.android.tools.r8.errors.dontwarn.EmptyDontWarnConfiguration -> com.android.tools.r8.internal.ZM0:
+com.android.tools.r8.errors.dontwarn.EmptyDontWarnConfiguration -> com.android.tools.r8.internal.cN0:
     1:1:void <init>():10:10 -> <init>
     boolean matches(com.android.tools.r8.graph.DexType) -> a
     boolean validate(com.android.tools.r8.utils.InternalOptions) -> a
-com.android.tools.r8.errors.dontwarn.NonEmptyDontWarnConfiguration -> com.android.tools.r8.internal.la1:
+com.android.tools.r8.errors.dontwarn.NonEmptyDontWarnConfiguration -> com.android.tools.r8.internal.oa1:
     java.util.List dontWarnPatterns -> a
     java.util.Map matchedDontWarnPatterns -> b
     boolean $assertionsDisabled -> c
@@ -56141,7 +56138,7 @@ com.android.tools.r8.experimental.graphinfo.FieldGraphNode -> com.android.tools.
     1:1:com.android.tools.r8.references.FieldReference getReference():21:21 -> getReference
     1:1:int hashCode():32:32 -> hashCode
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo -> com.android.tools.r8.internal.VQ0:
+com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo -> com.android.tools.r8.internal.YQ0:
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo UNKNOWN -> b
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind kind -> a
     boolean $assertionsDisabled -> c
@@ -56171,10 +56168,10 @@ com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo -> com.android.tools.r
     1:1:boolean equals(java.lang.Object):103:103 -> equals
     1:1:int hashCode():108:108 -> hashCode
     1:1:java.lang.String toString():98:98 -> toString
-com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$1 -> com.android.tools.r8.internal.UQ0:
+com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$1 -> com.android.tools.r8.internal.XQ0:
     int[] $SwitchMap$com$android$tools$r8$experimental$graphinfo$GraphEdgeInfo$EdgeKind -> a
     1:1:void <clinit>():50:50 -> <clinit>
-com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind -> com.android.tools.r8.internal.VQ0$a:
+com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind -> com.android.tools.r8.internal.YQ0$a:
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind[] $VALUES -> s
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind ReachableFromLiveType -> m
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind ReflectiveUseFrom -> l
@@ -56237,7 +56234,7 @@ com.android.tools.r8.experimental.graphinfo.MethodGraphNode -> com.android.tools
     1:1:com.android.tools.r8.references.MethodReference getReference():21:21 -> getReference
     1:1:int hashCode():32:32 -> hashCode
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.features.ClassToFeatureSplitMap -> com.android.tools.r8.internal.uH0:
+com.android.tools.r8.features.ClassToFeatureSplitMap -> com.android.tools.r8.internal.xH0:
     java.util.Map classToFeatureSplitMap -> a
     java.util.Map representativeStringsForFeatureSplit -> b
     int $r8$clinit -> d
@@ -56296,12 +56293,12 @@ com.android.tools.r8.features.ClassToFeatureSplitMap -> com.android.tools.r8.int
     84:84:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):153:153 -> a
     84:84:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):168 -> a
     1:1:boolean isEmpty():149:149 -> b
-com.android.tools.r8.features.FeatureSplitConfiguration -> com.android.tools.r8.internal.BO0:
+com.android.tools.r8.features.FeatureSplitConfiguration -> com.android.tools.r8.internal.EO0:
     java.util.List featureSplits -> a
     1:2:void <init>(java.util.List):20:21 -> <init>
     1:16:java.util.Collection getDataResourceProvidersAndConsumers():44:59 -> a
     1:1:java.util.List getFeatureSplits():68:68 -> b
-com.android.tools.r8.features.FeatureSplitConfiguration$DataResourceProvidersAndConsumer -> com.android.tools.r8.internal.AO0:
+com.android.tools.r8.features.FeatureSplitConfiguration$DataResourceProvidersAndConsumer -> com.android.tools.r8.internal.DO0:
     com.android.tools.r8.DataResourceConsumer consumer -> b
     java.util.Set providers -> a
     1:3:void <init>(java.util.Set,com.android.tools.r8.DataResourceConsumer):29:31 -> <init>
@@ -56384,7 +56381,7 @@ com.android.tools.r8.graph.AccessControl -> com.android.tools.r8.graph.a:
     1:1:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):23:23 -> a
     2:2:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):22:22 -> a
     3:3:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):61:61 -> a
-    4:4:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.ProgramMethod.getContextClass():72:72 -> a
+    4:4:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.ProgramMethod.getContextClass():77:77 -> a
     4:4:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):61 -> a
     5:5:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):61:61 -> a
     6:6:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):60:60 -> a
@@ -56806,186 +56803,189 @@ com.android.tools.r8.graph.AppView -> com.android.tools.r8.graph.i:
     com.android.tools.r8.graph.AppInfo appInfo -> a
     com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker -> t
     com.android.tools.r8.errors.dontwarn.DontWarnConfiguration dontWarnConfiguration -> d
-    1:1:void <clinit>():54:54 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):115:115 -> <init>
-    2:73:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):70:141 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer libraryMethodOptimizer():350:350 -> A
-    1:1:com.android.tools.r8.utils.InternalOptions options():474:474 -> B
-    1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker():358:358 -> C
-    1:1:com.android.tools.r8.shaking.RootSetUtils$RootSet rootSet():486:486 -> D
-    1:1:void setAllCodeProcessed():252:252 -> E
-    1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory simpleInliningConstraintFactory():203:203 -> F
-    1:1:com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums():574:574 -> G
-    1:4:boolean validateUnboxedEnumsHaveBeenPruned():584:587 -> H
-    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses():564:564 -> I
-    1:1:com.android.tools.r8.graph.AppView withClassHierarchy():599:599 -> J
+    1:1:void <clinit>():55:55 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):116:116 -> <init>
+    2:73:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):71:142 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer libraryMethodOptimizer():351:351 -> A
+    1:1:com.android.tools.r8.utils.InternalOptions options():475:475 -> B
+    1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker():359:359 -> C
+    1:1:com.android.tools.r8.shaking.RootSetUtils$RootSet rootSet():487:487 -> D
+    1:1:void setAllCodeProcessed():253:253 -> E
+    1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory simpleInliningConstraintFactory():204:204 -> F
+    1:1:com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums():579:579 -> G
+    1:4:boolean validateUnboxedEnumsHaveBeenPruned():589:592 -> H
+    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses():569:569 -> I
+    1:1:com.android.tools.r8.graph.AppView withClassHierarchy():604:604 -> J
     com.android.tools.r8.graph.AppView withLiveness() -> K
-    1:1:com.android.tools.r8.graph.AppView withoutClassHierarchy():606:606 -> L
-    2:2:boolean hasClassHierarchy():594:594 -> L
-    2:2:com.android.tools.r8.graph.AppView withoutClassHierarchy():606 -> L
-    3:3:com.android.tools.r8.graph.AppView withoutClassHierarchy():606:606 -> L
-    1:1:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):160:160 -> a
-    2:3:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):155:156 -> a
-    2:3:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):161 -> a
-    4:4:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):161:161 -> a
-    5:5:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):166:166 -> a
-    6:6:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication):170:170 -> a
-    7:8:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):175:176 -> a
+    1:1:com.android.tools.r8.graph.AppView withoutClassHierarchy():611:611 -> L
+    2:2:boolean hasClassHierarchy():599:599 -> L
+    2:2:com.android.tools.r8.graph.AppView withoutClassHierarchy():611 -> L
+    3:3:com.android.tools.r8.graph.AppView withoutClassHierarchy():611:611 -> L
+    1:1:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):161:161 -> a
+    2:3:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):156:157 -> a
+    2:3:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):162 -> a
+    4:4:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):162:162 -> a
+    5:5:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):167:167 -> a
+    6:6:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication):171:171 -> a
+    7:8:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):176:177 -> a
     9:9:com.android.tools.r8.features.ClassToFeatureSplitMap com.android.tools.r8.features.ClassToFeatureSplitMap.createInitialClassToFeatureSplitMap(com.android.tools.r8.utils.InternalOptions):55:55 -> a
-    9:9:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):176 -> a
+    9:9:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):177 -> a
     10:10:com.android.tools.r8.features.ClassToFeatureSplitMap com.android.tools.r8.features.ClassToFeatureSplitMap.createInitialClassToFeatureSplitMap(com.android.tools.r8.utils.InternalOptions):54:54 -> a
-    10:10:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):176 -> a
-    11:14:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):178:181 -> a
-    15:15:void setAppServices(com.android.tools.r8.graph.AppServices):264:264 -> a
-    16:16:void setClassesEscapingIntoLibrary(java.util.function.Predicate):277:277 -> a
-    17:17:void setSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexValue$DexValueString):281:281 -> a
-    18:18:com.android.tools.r8.graph.DexValue$DexValueString getSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass):285:285 -> a
-    19:19:com.android.tools.r8.graph.DexItemFactory dexItemFactory():309:309 -> a
-    20:21:void withArgumentPropagator(com.android.tools.r8.utils.ThrowingConsumer):337:338 -> a
-    22:23:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):391:392 -> a
-    24:25:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):433:434 -> a
-    24:25:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):702 -> a
-    26:44:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):703:721 -> a
+    10:10:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):177 -> a
+    11:14:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):179:182 -> a
+    15:15:void setAppServices(com.android.tools.r8.graph.AppServices):265:265 -> a
+    16:16:void setClassesEscapingIntoLibrary(java.util.function.Predicate):278:278 -> a
+    17:17:void setSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexValue$DexValueString):282:282 -> a
+    18:18:com.android.tools.r8.graph.DexValue$DexValueString getSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass):286:286 -> a
+    19:19:com.android.tools.r8.graph.DexItemFactory dexItemFactory():310:310 -> a
+    20:21:void withArgumentPropagator(com.android.tools.r8.utils.ThrowingConsumer):338:339 -> a
+    22:23:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):392:393 -> a
+    24:25:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):434:435 -> a
+    24:25:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):707 -> a
+    26:44:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):708:726 -> a
     45:45:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingLens():0:0 -> a
-    45:45:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):727 -> a
-    46:55:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):729:738 -> a
-    56:57:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):433:434 -> a
-    58:58:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):453:453 -> a
-    59:59:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):458:458 -> a
-    60:60:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():482:482 -> a
-    60:60:boolean checkForTesting(java.util.function.Supplier):774 -> a
-    61:61:boolean checkForTesting(java.util.function.Supplier):774:774 -> a
-    62:63:void setRootSet(com.android.tools.r8.shaking.RootSetUtils$RootSet):490:491 -> a
-    64:65:void setMainDexRootSet(com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet):495:496 -> a
-    66:67:void setProguardCompatibilityActions(com.android.tools.r8.shaking.ProguardCompatibilityActions):521:522 -> a
-    68:68:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):550:550 -> a
-    69:69:boolean hasHorizontallyMergedClasses():537:537 -> a
-    69:69:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):550 -> a
-    70:70:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):550:550 -> a
-    71:71:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():545:545 -> a
-    71:71:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):551 -> a
-    72:73:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):551:552 -> a
-    74:74:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():482:482 -> a
-    74:74:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):553 -> a
-    75:77:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):553:555 -> a
-    78:78:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():545:545 -> a
-    78:78:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):555 -> a
-    79:79:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):555:555 -> a
-    80:81:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):568:569 -> a
-    82:82:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():482:482 -> a
-    82:82:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):570 -> a
-    83:83:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):570:570 -> a
-    84:85:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):578:579 -> a
-    86:86:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():482:482 -> a
-    86:86:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):580 -> a
-    87:87:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):580:580 -> a
-    88:88:boolean hasLiveness():611:611 -> a
-    88:88:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):741 -> a
-    89:90:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):743:744 -> a
-    91:91:com.android.tools.r8.graph.AppServices appServices():260:260 -> a
-    91:91:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):746 -> a
-    92:92:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):746:746 -> a
-    93:93:boolean hasInitClassLens():449:449 -> a
-    93:93:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):747 -> a
-    94:94:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):748:748 -> a
-    95:95:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):453:453 -> a
-    95:95:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):748 -> a
-    96:96:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):750:750 -> a
-    97:97:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():516:516 -> a
-    97:97:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):752 -> a
-    98:98:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):752:752 -> a
-    99:99:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):751:751 -> a
-    100:100:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet getMainDexRootSet():504:504 -> a
-    100:100:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):754 -> a
-    101:101:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):755:755 -> a
-    102:104:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):624:626 -> a
-    105:105:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):630:630 -> a
-    106:106:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    106:106:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
-    107:111:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):633:637 -> a
-    112:121:void pruneItems(com.android.tools.r8.graph.PrunedItems):645:654 -> a
-    122:122:void pruneAppInfo(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.graph.AppView):672:672 -> a
-    122:122:void pruneItems(com.android.tools.r8.graph.PrunedItems):656 -> a
-    123:123:com.android.tools.r8.graph.AppServices appServices():260:260 -> a
-    123:123:void pruneItems(com.android.tools.r8.graph.PrunedItems):658 -> a
-    124:126:void pruneItems(com.android.tools.r8.graph.PrunedItems):659:661 -> a
-    127:127:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():516:516 -> a
-    127:127:void pruneItems(com.android.tools.r8.graph.PrunedItems):663 -> a
-    128:128:void pruneItems(com.android.tools.r8.graph.PrunedItems):663:663 -> a
-    129:133:void pruneItems(com.android.tools.r8.graph.PrunedItems):662:666 -> a
-    134:136:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):688:690 -> a
-    137:137:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):723:723 -> a
-    138:138:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingLens():0:0 -> a
-    138:138:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):723 -> a
-    139:139:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingIdentityLens():0:0 -> a
-    139:139:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):723 -> a
-    140:141:void setAlreadyLibraryDesugared(java.util.Set):761:762 -> a
-    142:146:boolean isAlreadyLibraryDesugared(com.android.tools.r8.graph.DexProgramClass):766:770 -> a
-    1:1:com.android.tools.r8.graph.AppView createForL8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):186:186 -> b
-    2:2:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):190:190 -> b
-    3:4:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):155:156 -> b
-    3:4:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):191 -> b
-    5:5:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):191:191 -> b
-    6:6:com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory():195:195 -> b
-    7:8:void withCallSiteOptimizationInfoPropagator(com.android.tools.r8.utils.ThrowingConsumer):344:345 -> b
-    9:10:java.lang.Object withGeneratedMessageLiteBuilderShrinker(java.util.function.Function,java.lang.Object):421:422 -> b
-    11:11:void setCfByteCodePassThrough(java.util.Set):462:462 -> b
-    12:12:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):677:677 -> b
-    1:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):155:156 -> c
-    3:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):290:290 -> c
-    4:5:void withGeneratedExtensionRegistryShrinker(com.android.tools.r8.utils.ThrowingConsumer):384:385 -> c
-    6:7:java.lang.Object withGeneratedMessageLiteShrinker(java.util.function.Function,java.lang.Object):413:414 -> c
-    8:8:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():526:526 -> c
-    9:9:boolean hasHorizontallyMergedClasses():537:537 -> c
-    9:9:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():527 -> c
-    10:13:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():528:531 -> c
-    1:1:boolean isModeled(com.android.tools.r8.graph.DexType):151:151 -> d
-    2:3:com.android.tools.r8.graph.AppInfo appInfo():207:208 -> d
-    4:6:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):232:234 -> d
-    7:7:void unsetAppInfoForDesugaring():228:228 -> d
-    7:7:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):235 -> d
-    8:11:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):237:240 -> d
-    12:13:void withGeneratedMessageLiteBuilderShrinker(com.android.tools.r8.utils.ThrowingConsumer):406:407 -> d
-    14:15:java.lang.Object withInitializedClassesInInstanceMethods(java.util.function.Function,java.lang.Object):467:468 -> d
-    1:9:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfoForDesugaring():216:224 -> e
-    10:11:boolean isClassEscapingIntoLibrary(com.android.tools.r8.graph.DexType):272:273 -> e
-    12:12:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):376:376 -> e
+    45:45:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):732 -> a
+    46:55:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):734:743 -> a
+    56:57:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):434:435 -> a
+    58:58:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):454:454 -> a
+    59:59:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):459:459 -> a
+    60:60:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():483:483 -> a
+    60:60:boolean checkForTesting(java.util.function.Supplier):779 -> a
+    61:61:boolean checkForTesting(java.util.function.Supplier):779:779 -> a
+    62:63:void setRootSet(com.android.tools.r8.shaking.RootSetUtils$RootSet):491:492 -> a
+    64:65:void setMainDexRootSet(com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet):496:497 -> a
+    66:66:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():509:509 -> a
+    66:66:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):513 -> a
+    67:67:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):513:513 -> a
+    68:69:void setProguardCompatibilityActions(com.android.tools.r8.shaking.ProguardCompatibilityActions):526:527 -> a
+    70:70:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):555:555 -> a
+    71:71:boolean hasHorizontallyMergedClasses():542:542 -> a
+    71:71:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):555 -> a
+    72:72:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):555:555 -> a
+    73:73:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():550:550 -> a
+    73:73:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):556 -> a
+    74:75:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):556:557 -> a
+    76:76:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():483:483 -> a
+    76:76:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):558 -> a
+    77:79:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):558:560 -> a
+    80:80:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():550:550 -> a
+    80:80:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):560 -> a
+    81:81:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):560:560 -> a
+    82:83:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):573:574 -> a
+    84:84:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():483:483 -> a
+    84:84:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):575 -> a
+    85:85:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):575:575 -> a
+    86:87:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):583:584 -> a
+    88:88:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():483:483 -> a
+    88:88:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):585 -> a
+    89:89:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):585:585 -> a
+    90:90:boolean hasLiveness():616:616 -> a
+    90:90:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):746 -> a
+    91:92:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):748:749 -> a
+    93:93:com.android.tools.r8.graph.AppServices appServices():261:261 -> a
+    93:93:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):751 -> a
+    94:94:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):751:751 -> a
+    95:95:boolean hasInitClassLens():450:450 -> a
+    95:95:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):752 -> a
+    96:96:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):753:753 -> a
+    97:97:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):454:454 -> a
+    97:97:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):753 -> a
+    98:98:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):755:755 -> a
+    99:99:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():521:521 -> a
+    99:99:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):757 -> a
+    100:100:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):757:757 -> a
+    101:101:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):756:756 -> a
+    102:102:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet getMainDexRootSet():505:505 -> a
+    102:102:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):759 -> a
+    103:103:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):760:760 -> a
+    104:106:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):629:631 -> a
+    107:107:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):635:635 -> a
+    108:108:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    108:108:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):635 -> a
+    109:113:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):638:642 -> a
+    114:123:void pruneItems(com.android.tools.r8.graph.PrunedItems):650:659 -> a
+    124:124:void pruneAppInfo(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.graph.AppView):677:677 -> a
+    124:124:void pruneItems(com.android.tools.r8.graph.PrunedItems):661 -> a
+    125:125:com.android.tools.r8.graph.AppServices appServices():261:261 -> a
+    125:125:void pruneItems(com.android.tools.r8.graph.PrunedItems):663 -> a
+    126:128:void pruneItems(com.android.tools.r8.graph.PrunedItems):664:666 -> a
+    129:129:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():521:521 -> a
+    129:129:void pruneItems(com.android.tools.r8.graph.PrunedItems):668 -> a
+    130:130:void pruneItems(com.android.tools.r8.graph.PrunedItems):668:668 -> a
+    131:135:void pruneItems(com.android.tools.r8.graph.PrunedItems):667:671 -> a
+    136:138:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):693:695 -> a
+    139:139:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):728:728 -> a
+    140:140:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingLens():0:0 -> a
+    140:140:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):728 -> a
+    141:141:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingIdentityLens():0:0 -> a
+    141:141:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):728 -> a
+    142:143:void setAlreadyLibraryDesugared(java.util.Set):766:767 -> a
+    144:148:boolean isAlreadyLibraryDesugared(com.android.tools.r8.graph.DexProgramClass):771:775 -> a
+    1:1:com.android.tools.r8.graph.AppView createForL8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):187:187 -> b
+    2:2:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):191:191 -> b
+    3:4:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):156:157 -> b
+    3:4:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):192 -> b
+    5:5:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):192:192 -> b
+    6:6:com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory():196:196 -> b
+    7:8:void withCallSiteOptimizationInfoPropagator(com.android.tools.r8.utils.ThrowingConsumer):345:346 -> b
+    9:10:java.lang.Object withGeneratedMessageLiteBuilderShrinker(java.util.function.Function,java.lang.Object):422:423 -> b
+    11:11:void setCfByteCodePassThrough(java.util.Set):463:463 -> b
+    12:12:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):682:682 -> b
+    1:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):156:157 -> c
+    3:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):291:291 -> c
+    4:5:void withGeneratedExtensionRegistryShrinker(com.android.tools.r8.utils.ThrowingConsumer):385:386 -> c
+    6:7:java.lang.Object withGeneratedMessageLiteShrinker(java.util.function.Function,java.lang.Object):414:415 -> c
+    8:8:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():531:531 -> c
+    9:9:boolean hasHorizontallyMergedClasses():542:542 -> c
+    9:9:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():532 -> c
+    10:13:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():533:536 -> c
+    1:1:boolean isModeled(com.android.tools.r8.graph.DexType):152:152 -> d
+    2:3:com.android.tools.r8.graph.AppInfo appInfo():208:209 -> d
+    4:6:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):233:235 -> d
+    7:7:void unsetAppInfoForDesugaring():229:229 -> d
+    7:7:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):236 -> d
+    8:11:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):238:241 -> d
+    12:13:void withGeneratedMessageLiteBuilderShrinker(com.android.tools.r8.utils.ThrowingConsumer):407:408 -> d
+    14:15:java.lang.Object withInitializedClassesInInstanceMethods(java.util.function.Function,java.lang.Object):468:469 -> d
+    1:9:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfoForDesugaring():217:225 -> e
+    10:11:boolean isClassEscapingIntoLibrary(com.android.tools.r8.graph.DexType):273:274 -> e
+    12:12:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):377:377 -> e
     13:13:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1469:1469 -> e
-    13:13:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):376 -> e
-    14:14:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):377:377 -> e
-    15:16:void withGeneratedMessageLiteShrinker(com.android.tools.r8.utils.ThrowingConsumer):399:400 -> e
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness appInfoWithLiveness():212:212 -> f
-    2:12:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):294:304 -> f
-    13:14:void withProtoShrinker(com.android.tools.r8.utils.ThrowingConsumer):363:364 -> f
-    15:16:java.lang.Object withProtoShrinker(java.util.function.Function,java.lang.Object):369:370 -> f
-    1:1:com.android.tools.r8.graph.AppServices appServices():260:260 -> g
-    1:1:com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator callSiteOptimizationInfoPropagator():332:332 -> h
-    1:1:boolean canUseInitClass():441:441 -> i
+    13:13:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):377 -> e
+    14:14:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):378:378 -> e
+    15:16:void withGeneratedMessageLiteShrinker(com.android.tools.r8.utils.ThrowingConsumer):400:401 -> e
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness appInfoWithLiveness():213:213 -> f
+    2:12:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):295:305 -> f
+    13:14:void withProtoShrinker(com.android.tools.r8.utils.ThrowingConsumer):364:365 -> f
+    15:16:java.lang.Object withProtoShrinker(java.util.function.Function,java.lang.Object):370:371 -> f
+    1:1:com.android.tools.r8.graph.AppServices appServices():261:261 -> g
+    1:1:com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator callSiteOptimizationInfoPropagator():333:333 -> h
+    1:1:boolean canUseInitClass():442:442 -> i
     2:2:boolean com.android.tools.r8.graph.InitClassLens.isFinal():0:0 -> i
-    2:2:boolean canUseInitClass():441 -> i
-    1:1:com.android.tools.r8.graph.GraphLens clearCodeRewritings():256:256 -> j
+    2:2:boolean canUseInitClass():442 -> i
+    1:1:com.android.tools.r8.graph.GraphLens clearCodeRewritings():257:257 -> j
     2:3:com.android.tools.r8.graph.GraphLens com.android.tools.r8.graph.GraphLens.withCodeRewritingsApplied(com.android.tools.r8.graph.DexItemFactory):483:484 -> j
-    2:3:com.android.tools.r8.graph.GraphLens clearCodeRewritings():256 -> j
-    4:4:com.android.tools.r8.graph.GraphLens clearCodeRewritings():256:256 -> j
-    1:1:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():323:323 -> k
-    2:2:boolean verifyMainThread():145:145 -> k
-    2:2:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():323 -> k
-    3:3:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():324:324 -> k
-    1:1:boolean enableWholeProgramOptimizations():313:313 -> l
-    1:1:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration getDontWarnConfiguration():268:268 -> m
-    1:1:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():508:508 -> n
-    1:1:com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection getLibraryMethodSideEffectModelCollection():354:354 -> o
-    1:1:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet getMainDexRootSet():504:504 -> p
-    1:1:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():516:516 -> q
-    1:1:com.android.tools.r8.synthesis.SyntheticItems getSyntheticItems():328:328 -> r
-    1:1:com.android.tools.r8.graph.GraphLens graphLens():428:428 -> s
-    1:1:boolean hasCfByteCodePassThroughMethods():641:641 -> t
-    1:1:boolean hasMainDexRootSet():500:500 -> u
-    1:1:boolean hasProguardCompatibilityActions():512:512 -> v
-    1:1:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():545:545 -> w
-    1:1:com.android.tools.r8.graph.InitClassLens initClassLens():445:445 -> x
-    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory instanceFieldInitializationInfoFactory():199:199 -> y
-    1:1:boolean isAllCodeProcessed():248:248 -> z
+    2:3:com.android.tools.r8.graph.GraphLens clearCodeRewritings():257 -> j
+    4:4:com.android.tools.r8.graph.GraphLens clearCodeRewritings():257:257 -> j
+    1:1:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():324:324 -> k
+    2:2:boolean verifyMainThread():146:146 -> k
+    2:2:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():324 -> k
+    3:3:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():325:325 -> k
+    1:1:boolean enableWholeProgramOptimizations():314:314 -> l
+    1:1:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration getDontWarnConfiguration():269:269 -> m
+    1:1:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():509:509 -> n
+    1:1:com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection getLibraryMethodSideEffectModelCollection():355:355 -> o
+    1:1:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet getMainDexRootSet():505:505 -> p
+    1:1:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():521:521 -> q
+    1:1:com.android.tools.r8.synthesis.SyntheticItems getSyntheticItems():329:329 -> r
+    1:1:com.android.tools.r8.graph.GraphLens graphLens():429:429 -> s
+    1:1:boolean hasCfByteCodePassThroughMethods():646:646 -> t
+    1:1:boolean hasMainDexRootSet():501:501 -> u
+    1:1:boolean hasProguardCompatibilityActions():517:517 -> v
+    1:1:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():550:550 -> w
+    1:1:com.android.tools.r8.graph.InitClassLens initClassLens():446:446 -> x
+    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory instanceFieldInitializationInfoFactory():200:200 -> y
+    1:1:boolean isAllCodeProcessed():249:249 -> z
 com.android.tools.r8.graph.ApplicationReaderMap -> com.android.tools.r8.internal.mz0:
     1:5:java.util.Map getDescriptorMap(com.android.tools.r8.utils.InternalOptions):14:18 -> a
     6:6:void lambda$getTypeMap$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String):27:27 -> a
@@ -57019,10 +57019,10 @@ com.android.tools.r8.graph.AppliedGraphLens -> com.android.tools.r8.graph.j:
     1:1:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):149:149 -> e
     com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
     boolean isContextFreeForMethods() -> f
-com.android.tools.r8.graph.ArgumentUse -> com.android.tools.r8.internal.Jz0:
+com.android.tools.r8.graph.ArgumentUse -> com.android.tools.r8.internal.Mz0:
     1:1:void <init>():7:7 -> <init>
     boolean register(int) -> a
-com.android.tools.r8.graph.AssemblyWriter -> com.android.tools.r8.internal.cA0:
+com.android.tools.r8.graph.AssemblyWriter -> com.android.tools.r8.internal.fA0:
     com.android.tools.r8.kotlin.Kotlin kotlin -> i
     com.android.tools.r8.contexts.CompilationContext compilationContext -> k
     com.android.tools.r8.graph.AppInfo appInfo -> h
@@ -57038,7 +57038,7 @@ com.android.tools.r8.graph.AssemblyWriter -> com.android.tools.r8.internal.cA0:
     2:29:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,boolean,boolean,boolean):34:61 -> <init>
     1:1:java.lang.String getFileEnding():66:66 -> a
     2:10:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):129:137 -> a
-    11:11:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> a
+    11:11:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> a
     11:11:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):138 -> a
     12:15:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):138:141 -> a
     16:36:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):152:172 -> a
@@ -57049,7 +57049,7 @@ com.android.tools.r8.graph.AssemblyWriter -> com.android.tools.r8.internal.cA0:
     55:55:void writeAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationSet,java.io.PrintStream):204:204 -> a
     void writeClassFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> b
     1:2:void writeIR(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):178:179 -> b
-    3:3:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):326:326 -> b
+    3:3:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):320:320 -> b
     3:3:void writeIR(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):179 -> b
     4:13:void writeIR(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):180:189 -> b
     1:30:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):72:101 -> c
@@ -57057,7 +57057,7 @@ com.android.tools.r8.graph.AssemblyWriter -> com.android.tools.r8.internal.cA0:
     52:57:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):110:115 -> c
     1:1:void writeFieldsFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):147:147 -> d
     1:4:void writeFieldsHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):120:123 -> e
-com.android.tools.r8.graph.BottomUpClassHierarchyTraversal -> com.android.tools.r8.internal.tC0:
+com.android.tools.r8.graph.BottomUpClassHierarchyTraversal -> com.android.tools.r8.internal.wC0:
     java.util.function.Function immediateSubtypesProvider -> g
     1:2:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):18:19 -> <init>
     1:1:com.android.tools.r8.graph.BottomUpClassHierarchyTraversal forAllClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):28:28 -> a
@@ -57119,7 +57119,7 @@ com.android.tools.r8.graph.CfCode -> com.android.tools.r8.graph.l:
     16:16:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):289 -> a
     17:17:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):289:289 -> a
     18:19:void write(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):325:326 -> a
-    20:20:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):766:766 -> a
+    20:20:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):775:775 -> a
     20:20:void write(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):326 -> a
     21:27:void write(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):326:332 -> a
     28:44:boolean shouldAddParameterNames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):296:312 -> a
@@ -57139,106 +57139,105 @@ com.android.tools.r8.graph.CfCode -> com.android.tools.r8.graph.l:
     110:110:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,int):394 -> a
     111:117:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,int):395:395 -> a
     118:118:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):429:429 -> a
-    119:119:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.ir.conversion.IRBuilder.lookupPrototypeChanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):456:456 -> a
+    119:119:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.ir.conversion.IRBuilder.lookupPrototypeChanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):458:458 -> a
     119:119:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):429 -> a
     120:122:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):428:430 -> a
     123:127:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):442:446 -> a
     128:146:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):531:549 -> a
-    147:152:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):554:559 -> a
-    153:153:void lambda$registerCodeReferences$5(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfTryCatch):559:559 -> a
-    154:159:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):564:569 -> a
-    160:160:void lambda$registerCodeReferencesForDesugaring$6(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.cf.code.CfTryCatch):569:569 -> a
-    161:201:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):576:616 -> a
-    202:202:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):615:615 -> a
-    203:203:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):587:587 -> a
-    204:232:void registerArgumentReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ArgumentUse):624:652 -> a
-    233:233:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):664:664 -> a
-    234:244:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):672:682 -> a
-    245:245:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():489:489 -> a
-    245:245:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):682 -> a
-    246:246:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():275:275 -> a
-    246:246:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):683 -> a
-    247:255:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):684:692 -> a
-    256:262:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):691:697 -> a
-    263:263:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():283:283 -> a
-    263:263:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):700 -> a
-    264:264:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):700:700 -> a
-    265:289:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):706:730 -> a
-    290:291:void com.android.tools.r8.graph.CfCode$LocalVariableInfo.<init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel):95:96 -> a
-    290:291:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):730 -> a
-    292:292:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):727:727 -> a
-    293:296:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):735:738 -> a
-    297:297:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    297:297:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):738 -> a
-    298:305:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):739:746 -> a
-    306:306:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    306:306:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):746 -> a
-    307:311:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):748:752 -> a
-    312:312:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):749:749 -> a
-    313:313:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    313:313:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):754 -> a
-    314:320:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):755:761 -> a
-    321:332:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):774:785 -> a
-    333:333:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):285:285 -> a
-    333:333:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):785 -> a
-    334:338:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):790:794 -> a
-    339:339:boolean com.android.tools.r8.cf.code.CfInstruction.isFrame():0:0 -> a
-    339:339:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):794 -> a
-    340:347:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):795:802 -> a
-    348:348:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):800:800 -> a
-    349:353:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.multipleFramesForLabel(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):31:35 -> a
-    349:353:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):800 -> a
-    354:368:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):799:813 -> a
-    369:369:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):811:811 -> a
-    370:374:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.unexpectedStackMapFrame(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):22:26 -> a
-    370:374:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):811 -> a
-    375:375:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):810:810 -> a
-    376:376:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    376:376:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):820 -> a
-    377:377:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    377:377:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):822 -> a
-    378:383:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):823:828 -> a
-    384:384:boolean com.android.tools.r8.cf.code.CfInstruction.isThrow():0:0 -> a
-    384:384:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):898 -> a
-    384:384:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):828 -> a
-    385:394:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):898:907 -> a
-    385:394:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):828 -> a
-    395:395:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    395:395:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):907 -> a
-    395:395:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):828 -> a
-    396:396:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    396:396:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):907 -> a
-    396:396:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):828 -> a
-    397:397:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):912:912 -> a
-    397:397:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):828 -> a
-    398:402:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):832:836 -> a
-    403:403:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):834:834 -> a
-    404:409:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.noFramesForMethodWithJumps(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):40:45 -> a
-    404:409:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):834 -> a
-    410:417:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):833:840 -> a
-    418:418:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):352:352 -> a
-    418:418:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):840 -> a
-    419:419:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):841:841 -> a
-    420:420:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):352:352 -> a
-    420:420:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):841 -> a
-    421:437:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):842:858 -> a
-    438:471:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap computeInitialLocals(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):930:963 -> a
-    438:471:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):859 -> a
-    472:472:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):859:859 -> a
-    473:483:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):858:868 -> a
-    484:484:boolean com.android.tools.r8.cf.code.CfInstruction.isStore():0:0 -> a
-    484:484:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):868 -> a
-    485:489:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):868:872 -> a
-    490:499:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):871:880 -> a
-    500:511:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.toDiagnostics(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.cf.code.CfInstruction,java.lang.String,com.android.tools.r8.graph.AppView):55:66 -> a
-    500:511:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):875 -> a
-    512:512:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):874:874 -> a
-    513:513:com.android.tools.r8.graph.CfCode$StackMapStatus reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):893:893 -> a
-    514:514:java.util.function.BiPredicate isAssignablePredicate(com.android.tools.r8.graph.AppView):970:970 -> a
-    515:515:boolean lambda$isAssignablePredicate$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):970:970 -> a
-    516:539:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):975:998 -> a
-    540:544:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):997:1001 -> a
-    545:546:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1006:1007 -> a
+    147:158:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):554:565 -> a
+    159:164:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):573:578 -> a
+    165:165:void lambda$registerCodeReferencesForDesugaring$5(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.cf.code.CfTryCatch):578:578 -> a
+    166:206:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):585:625 -> a
+    207:207:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):624:624 -> a
+    208:208:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):596:596 -> a
+    209:237:void registerArgumentReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ArgumentUse):633:661 -> a
+    238:238:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):673:673 -> a
+    239:249:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):681:691 -> a
+    250:250:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():431:431 -> a
+    250:250:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):691 -> a
+    251:251:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():275:275 -> a
+    251:251:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):692 -> a
+    252:260:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):693:701 -> a
+    261:267:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):700:706 -> a
+    268:268:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():283:283 -> a
+    268:268:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):709 -> a
+    269:269:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):709:709 -> a
+    270:294:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):715:739 -> a
+    295:296:void com.android.tools.r8.graph.CfCode$LocalVariableInfo.<init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel):95:96 -> a
+    295:296:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):739 -> a
+    297:297:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):736:736 -> a
+    298:301:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):744:747 -> a
+    302:302:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    302:302:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):747 -> a
+    303:310:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):748:755 -> a
+    311:311:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    311:311:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):755 -> a
+    312:316:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):757:761 -> a
+    317:317:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):758:758 -> a
+    318:318:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    318:318:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):763 -> a
+    319:325:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):764:770 -> a
+    326:337:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):783:794 -> a
+    338:338:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):285:285 -> a
+    338:338:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):794 -> a
+    339:343:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):799:803 -> a
+    344:344:boolean com.android.tools.r8.cf.code.CfInstruction.isFrame():0:0 -> a
+    344:344:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):803 -> a
+    345:352:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):804:811 -> a
+    353:353:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):809:809 -> a
+    354:358:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.multipleFramesForLabel(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):31:35 -> a
+    354:358:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):809 -> a
+    359:373:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):808:822 -> a
+    374:374:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):820:820 -> a
+    375:379:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.unexpectedStackMapFrame(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):22:26 -> a
+    375:379:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):820 -> a
+    380:380:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):819:819 -> a
+    381:381:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    381:381:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):829 -> a
+    382:382:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    382:382:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):831 -> a
+    383:388:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):832:837 -> a
+    389:389:boolean com.android.tools.r8.cf.code.CfInstruction.isThrow():0:0 -> a
+    389:389:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):907 -> a
+    389:389:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):837 -> a
+    390:399:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):907:916 -> a
+    390:399:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):837 -> a
+    400:400:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    400:400:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):916 -> a
+    400:400:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):837 -> a
+    401:401:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    401:401:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):916 -> a
+    401:401:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):837 -> a
+    402:402:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):921:921 -> a
+    402:402:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):837 -> a
+    403:407:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):841:845 -> a
+    408:408:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):843:843 -> a
+    409:414:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.noFramesForMethodWithJumps(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):40:45 -> a
+    409:414:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):843 -> a
+    415:422:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):842:849 -> a
+    423:423:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):352:352 -> a
+    423:423:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):849 -> a
+    424:424:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):850:850 -> a
+    425:425:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):352:352 -> a
+    425:425:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):850 -> a
+    426:442:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):851:867 -> a
+    443:476:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap computeInitialLocals(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):939:972 -> a
+    443:476:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):868 -> a
+    477:477:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):868:868 -> a
+    478:488:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):867:877 -> a
+    489:489:boolean com.android.tools.r8.cf.code.CfInstruction.isStore():0:0 -> a
+    489:489:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):877 -> a
+    490:494:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):877:881 -> a
+    495:504:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):880:889 -> a
+    505:516:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.toDiagnostics(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.cf.code.CfInstruction,java.lang.String,com.android.tools.r8.graph.AppView):55:66 -> a
+    505:516:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):884 -> a
+    517:517:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):883:883 -> a
+    518:518:com.android.tools.r8.graph.CfCode$StackMapStatus reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):902:902 -> a
+    519:519:java.util.function.BiPredicate isAssignablePredicate(com.android.tools.r8.graph.AppView):979:979 -> a
+    520:520:boolean lambda$isAssignablePredicate$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):979:979 -> a
+    521:544:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):984:1007 -> a
+    545:549:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1006:1010 -> a
+    550:551:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1015:1016 -> a
     1:1:int getMaxStack():193:193 -> a0
     1:1:java.util.Collection lambda$acceptCompareTo$2(com.android.tools.r8.graph.CfCode):288:288 -> b
     2:6:void verifyFramesOrRemove(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):455:459 -> b
@@ -57254,14 +57253,14 @@ com.android.tools.r8.graph.CfCode -> com.android.tools.r8.graph.l:
     1:1:java.util.Collection lambda$acceptCompareTo$3(com.android.tools.r8.graph.CfCode):289:289 -> c
     1:2:com.android.tools.r8.graph.CfCode$StackMapStatus getStackMapStatus():201:202 -> c0
     1:1:java.util.List getTryCatchRanges():214:214 -> d0
-    1:2:boolean shouldComputeInitialFrame():916:917 -> e0
+    1:2:boolean shouldComputeInitialFrame():925:926 -> e0
     3:3:boolean com.android.tools.r8.cf.code.CfInstruction.isFrame():0:0 -> e0
-    3:3:boolean shouldComputeInitialFrame():917 -> e0
+    3:3:boolean shouldComputeInitialFrame():926 -> e0
     4:4:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> e0
-    4:4:boolean shouldComputeInitialFrame():919 -> e0
+    4:4:boolean shouldComputeInitialFrame():928 -> e0
     5:5:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> e0
-    5:5:boolean shouldComputeInitialFrame():919 -> e0
-    6:6:boolean shouldComputeInitialFrame():924:924 -> e0
+    5:5:boolean shouldComputeInitialFrame():928 -> e0
+    6:6:boolean shouldComputeInitialFrame():933:933 -> e0
     1:1:boolean estimatedSizeForInliningAtMost(int):236:236 -> g
     2:2:boolean computeEquals(java.lang.Object):411:411 -> g
     1:2:int countNonStackOperations(int):246:247 -> h
@@ -57269,10 +57268,10 @@ com.android.tools.r8.graph.CfCode -> com.android.tools.r8.graph.l:
     1:1:void setMaxStack(int):210:210 -> j
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():185:185 -> l
     com.android.tools.r8.utils.structural.StructuralItem self() -> q
-    1:1:java.lang.String toString():659:659 -> toString
+    1:1:java.lang.String toString():668:668 -> toString
     2:2:void com.android.tools.r8.cf.CfPrinter.<init>(com.android.tools.r8.graph.CfCode):127:127 -> toString
-    2:2:java.lang.String toString():659 -> toString
-    3:3:java.lang.String toString():659:659 -> toString
+    2:2:java.lang.String toString():668 -> toString
+    3:3:java.lang.String toString():668:668 -> toString
 com.android.tools.r8.graph.CfCode$LocalVariableInfo -> com.android.tools.r8.graph.l$a:
     com.android.tools.r8.graph.DebugLocalInfo local -> b
     boolean $assertionsDisabled -> e
@@ -57299,11 +57298,11 @@ com.android.tools.r8.graph.CfCode$LocalVariableInfo -> com.android.tools.r8.grap
     1:1:int access$300(com.android.tools.r8.graph.CfCode$LocalVariableInfo):81:81 -> d
     2:2:com.android.tools.r8.cf.code.CfLabel getStart():114:114 -> d
     1:1:java.lang.String toString():135:135 -> toString
-com.android.tools.r8.graph.CfCode$StackMapStatus$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.mD0:
+com.android.tools.r8.graph.CfCode$StackMapStatus$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.pD0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     boolean com.android.tools.r8.graph.CfCode$StackMapStatus.isValid() -> a
-com.android.tools.r8.graph.CfCodeDiagnostics -> com.android.tools.r8.internal.nD0:
+com.android.tools.r8.graph.CfCodeDiagnostics -> com.android.tools.r8.internal.qD0:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.MethodPosition methodPosition -> b
     java.lang.String diagnosticMessage -> c
@@ -57311,7 +57310,7 @@ com.android.tools.r8.graph.CfCodeDiagnostics -> com.android.tools.r8.internal.nD
     1:1:java.lang.String getDiagnosticMessage():26:26 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():16:16 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():21:21 -> getPosition
-com.android.tools.r8.graph.CfCodeStackMapValidatingException -> com.android.tools.r8.internal.pD0:
+com.android.tools.r8.graph.CfCodeStackMapValidatingException -> com.android.tools.r8.internal.sD0:
     int $r8$clinit -> a
     1:1:void <init>(java.lang.String):13:13 -> <init>
     1:1:com.android.tools.r8.graph.CfCodeStackMapValidatingException error(java.lang.String):17:17 -> a
@@ -57424,11 +57423,11 @@ com.android.tools.r8.graph.ClassAccessFlags -> com.android.tools.r8.graph.r:
     3:3:com.android.tools.r8.graph.ClassAccessFlags fromSharedAccessFlags(int):69 -> n
     com.android.tools.r8.utils.structural.StructuralItem self() -> q
     com.android.tools.r8.graph.AccessFlags self() -> x
-com.android.tools.r8.graph.ClassDefinition -> com.android.tools.r8.internal.iG0:
+com.android.tools.r8.graph.ClassDefinition -> com.android.tools.r8.internal.lG0:
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> C
     com.android.tools.r8.graph.DexClasspathClass asClasspathClass() -> k
     com.android.tools.r8.graph.MethodCollection getMethodCollection() -> z
-com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.internal.kG0:
+com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.internal.nG0:
     java.util.Deque worklist -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set visited -> c
@@ -57456,7 +57455,7 @@ com.android.tools.r8.graph.ClassKind -> com.android.tools.r8.graph.t:
     1:1:com.android.tools.r8.graph.DexLibraryClass lambda$static$2(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.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.synthesis.SyntheticMarker):125:125 -> d
 com.android.tools.r8.graph.ClassKind$Factory -> com.android.tools.r8.graph.s:
     com.android.tools.r8.graph.DexClass create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.synthesis.SyntheticMarker) -> a
-com.android.tools.r8.graph.ClasspathDefinition -> com.android.tools.r8.internal.NH0:
+com.android.tools.r8.graph.ClasspathDefinition -> com.android.tools.r8.internal.QH0:
     1:1:com.android.tools.r8.graph.ProgramDerivedContext asProgramDerivedContext(com.android.tools.r8.graph.ProgramDerivedContext):21:21 -> a
 com.android.tools.r8.graph.ClasspathField -> com.android.tools.r8.graph.u:
     boolean $assertionsDisabled -> e
@@ -57479,15 +57478,15 @@ com.android.tools.r8.graph.ClasspathMethod -> com.android.tools.r8.graph.v:
     3:3:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> X
     3:3:com.android.tools.r8.graph.DexClasspathClass getHolder():44 -> X
     4:5:com.android.tools.r8.graph.DexClasspathClass getHolder():44:45 -> X
-com.android.tools.r8.graph.ClasspathOrLibraryClass -> com.android.tools.r8.internal.OH0:
-com.android.tools.r8.graph.ClasspathOrLibraryContext -> com.android.tools.r8.internal.PH0:
+com.android.tools.r8.graph.ClasspathOrLibraryClass -> com.android.tools.r8.internal.RH0:
+com.android.tools.r8.graph.ClasspathOrLibraryContext -> com.android.tools.r8.internal.SH0:
     com.android.tools.r8.graph.ProgramDerivedContext programDerivedContext -> b
     com.android.tools.r8.graph.Definition context -> a
     1:3:void <init>(com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.ProgramDerivedContext):17:19 -> <init>
     1:1:com.android.tools.r8.graph.ClasspathOrLibraryContext create(com.android.tools.r8.graph.ClasspathDefinition,com.android.tools.r8.graph.ProgramDerivedContext):24:24 -> a
     2:2:com.android.tools.r8.graph.ClasspathOrLibraryContext create(com.android.tools.r8.graph.LibraryDefinition,com.android.tools.r8.graph.ProgramDerivedContext):29:29 -> a
     1:1:com.android.tools.r8.graph.Definition getContext():34:34 -> v
-com.android.tools.r8.graph.ClasspathOrLibraryDefinition -> com.android.tools.r8.internal.QH0:
+com.android.tools.r8.graph.ClasspathOrLibraryDefinition -> com.android.tools.r8.internal.TH0:
     com.android.tools.r8.graph.ClasspathOrLibraryDefinition asClasspathOrLibraryDefinition() -> e
 com.android.tools.r8.graph.Code -> com.android.tools.r8.graph.w:
     1:1:void <init>():16:16 -> <init>
@@ -57511,7 +57510,7 @@ com.android.tools.r8.graph.Code -> com.android.tools.r8.graph.w:
     5:5:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):98:98 -> a
     6:6:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):108:108 -> a
     1:1:boolean estimatedSizeForInliningAtMost(int):75:75 -> g
-com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.internal.fK0:
+com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.internal.iK0:
     com.android.tools.r8.graph.DexString name -> a
     com.android.tools.r8.graph.DexString signature -> c
     com.android.tools.r8.graph.DexType type -> b
@@ -57533,7 +57532,7 @@ com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.internal.fK0:
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():49:49 -> l
     com.android.tools.r8.utils.structural.StructuralItem self() -> q
     1:1:java.lang.String toString():122:122 -> toString
-com.android.tools.r8.graph.Definition -> com.android.tools.r8.internal.CK0:
+com.android.tools.r8.graph.Definition -> com.android.tools.r8.internal.FK0:
     com.android.tools.r8.graph.DexProgramClass asProgramClass() -> B
     boolean isProgramClass() -> D
     com.android.tools.r8.graph.ProgramMethod asProgramMethod() -> E
@@ -57569,7 +57568,7 @@ com.android.tools.r8.graph.DexAnnotation -> com.android.tools.r8.graph.x:
     1:1:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):60:60 -> a
     2:2:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):110:110 -> a
     3:11:boolean retainCompileTimeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):114:122 -> a
-    12:12:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):264:264 -> a
+    12:12:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):266:266 -> a
     12:12:boolean retainCompileTimeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):125 -> a
     13:13:com.android.tools.r8.graph.DexAnnotation createEnclosingClassAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):133:133 -> a
     14:18:com.android.tools.r8.graph.DexType getEnclosingClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):139:143 -> a
@@ -57612,7 +57611,7 @@ com.android.tools.r8.graph.DexAnnotation -> com.android.tools.r8.graph.x:
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():75:75 -> l
     com.android.tools.r8.utils.structural.StructuralItem self() -> q
     1:1:java.lang.String toString():101:101 -> toString
-com.android.tools.r8.graph.DexAnnotation$AnnotatedKind -> com.android.tools.r8.internal.oL0:
+com.android.tools.r8.graph.DexAnnotation$AnnotatedKind -> com.android.tools.r8.internal.rL0:
     com.android.tools.r8.graph.DexAnnotation$AnnotatedKind METHOD -> b
     com.android.tools.r8.graph.DexAnnotation$AnnotatedKind TYPE -> c
     com.android.tools.r8.graph.DexAnnotation$AnnotatedKind PARAMETER -> d
@@ -57778,7 +57777,7 @@ com.android.tools.r8.graph.DexApplication$ReorderBox -> com.android.tools.r8.gra
     1:2:void <init>(java.util.List):85:86 -> <init>
     1:1:java.util.List getClasses():99:99 -> a
     1:3:boolean reorderClasses():91:93 -> b
-com.android.tools.r8.graph.DexApplicationReadFlags -> com.android.tools.r8.internal.pL0:
+com.android.tools.r8.graph.DexApplicationReadFlags -> com.android.tools.r8.internal.sL0:
     boolean hasReadProgramClassFromDex -> a
     boolean hasReadProgramClassFromCf -> b
     boolean hasReadProgramRecord -> c
@@ -57786,7 +57785,7 @@ com.android.tools.r8.graph.DexApplicationReadFlags -> com.android.tools.r8.inter
     1:1:boolean hasReadProgramClassFromCf():24:24 -> a
     1:1:boolean hasReadProgramClassFromDex():28:28 -> b
     1:1:boolean hasReadProgramRecord():32:32 -> c
-com.android.tools.r8.graph.DexByteCodeWriter -> com.android.tools.r8.internal.DL0:
+com.android.tools.r8.graph.DexByteCodeWriter -> com.android.tools.r8.internal.GL0:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     1:3:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):27:29 -> <init>
@@ -57816,7 +57815,7 @@ com.android.tools.r8.graph.DexByteCodeWriter -> com.android.tools.r8.internal.DL
     void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> c
     void writeFieldsFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> d
     void writeFieldsHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> e
-com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider -> com.android.tools.r8.internal.CL0:
+com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider -> com.android.tools.r8.internal.FL0:
     java.io.PrintStream get(com.android.tools.r8.graph.DexClass) -> a
 com.android.tools.r8.graph.DexCallSite -> com.android.tools.r8.graph.G:
     com.android.tools.r8.graph.DexString methodName -> d
@@ -57932,7 +57931,7 @@ com.android.tools.r8.graph.DexClass -> com.android.tools.r8.graph.H:
     1:1:boolean hasNestMemberAttributes():1138:1138 -> F0
     1:1:boolean hasStaticFields():1161:1161 -> G0
     1:2:boolean hasStaticSynchronizedMethods():1199:1200 -> H0
-    3:3:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():489:489 -> H0
+    3:3:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():431:431 -> H0
     3:3:boolean hasStaticSynchronizedMethods():1200 -> H0
     1:5:java.util.List instanceFields():425:429 -> I0
     1:1:boolean isAbstract():647:647 -> J0
@@ -58157,7 +58156,7 @@ com.android.tools.r8.graph.DexClass -> com.android.tools.r8.graph.H:
     1:1:com.android.tools.r8.graph.DexString getSourceFile():177:177 -> y0
     1:1:com.android.tools.r8.graph.MethodCollection getMethodCollection():208:208 -> z
     1:1:com.android.tools.r8.graph.DexType getSuperType():769:769 -> z0
-com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.internal.FL0:
+com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.internal.IL0:
     void setField(int,com.android.tools.r8.graph.DexEncodedField) -> a
 com.android.tools.r8.graph.DexClassAndField -> com.android.tools.r8.graph.I:
     boolean $assertionsDisabled -> d
@@ -58228,7 +58227,7 @@ com.android.tools.r8.graph.DexClassAndMethod -> com.android.tools.r8.graph.K:
     8:9:com.android.tools.r8.graph.DexClassAndMethod create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):32:33 -> a
     10:10:boolean isStructurallyEqualTo(com.android.tools.r8.graph.DexClassAndMethod):41:41 -> a
     11:11:com.android.tools.r8.graph.DexType getArgumentType(int):63:63 -> a
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getArgumentType(int):201:201 -> a
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getArgumentType(int):205:205 -> a
     12:12:com.android.tools.r8.graph.DexType getArgumentType(int):63 -> a
     13:13:void accept(java.util.function.Consumer,java.util.function.Consumer):118:118 -> a
     1:1:com.android.tools.r8.graph.DexType getParameter(int):67:67 -> b
@@ -58270,13 +58269,13 @@ com.android.tools.r8.graph.DexCode -> com.android.tools.r8.graph.M:
     1:12:void <init>(int,int,int,com.android.tools.r8.code.Instruction[],com.android.tools.r8.graph.DexCode$Try[],com.android.tools.r8.graph.DexCode$TryHandler[],com.android.tools.r8.graph.DexDebugInfo):73:84 -> <init>
     1:7:int computeHashCode():243:249 -> M
     com.android.tools.r8.graph.DexCode asDexCode() -> O
-    1:2:int codeSizeInBytes():501:502 -> Q
+    1:2:int codeSizeInBytes():508:509 -> Q
     1:2:int estimatedDexCodeSizeUpperBoundInBytes():126 -> Q
     1:1:int estimatedSizeForInlining():121:121 -> R
     boolean isDexCode() -> T
     1:1:boolean isEmptyVoidMethod():259:259 -> U
     1:1:com.android.tools.r8.graph.DexDebugInfo getDebugInfo():135:135 -> X
-    1:8:com.android.tools.r8.graph.DexDebugInfoForWriting getDebugInfoForWriting():470:477 -> Y
+    1:8:com.android.tools.r8.graph.DexDebugInfoForWriting getDebugInfoForWriting():477:484 -> Y
     1:1:com.android.tools.r8.graph.DexCode withoutThisParameter():104:104 -> Z
     2:11:com.android.tools.r8.graph.DexDebugInfo debugInfoWithoutFirstParameter():229:238 -> Z
     2:11:com.android.tools.r8.graph.DexCode withoutThisParameter():111 -> Z
@@ -58294,30 +58293,30 @@ com.android.tools.r8.graph.DexCode -> com.android.tools.r8.graph.M:
     78:86:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):282:290 -> a
     87:87:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):295:295 -> a
     88:88:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):300:300 -> a
-    89:94:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):304:309 -> a
-    95:158:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):321:384 -> a
-    159:159:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):367:367 -> a
-    160:162:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):451:453 -> a
-    163:163:boolean com.android.tools.r8.code.Instruction.isDexItemBasedConstString():0:0 -> a
-    163:163:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):453 -> a
-    164:167:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):453:456 -> a
-    168:168:boolean com.android.tools.r8.code.Instruction.isConstStringJumbo():0:0 -> a
-    168:168:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):457 -> a
-    169:173:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):458:462 -> a
-    174:174:void com.android.tools.r8.graph.DexDebugInfo.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):68:68 -> a
-    174:174:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):462 -> a
-    175:175:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    175:175:void com.android.tools.r8.graph.DexDebugInfo.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):70 -> a
-    175:175:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):462 -> a
-    176:177:void com.android.tools.r8.graph.DexDebugInfo.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):73:74 -> a
-    176:177:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):462 -> a
-    178:178:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):464:464 -> a
-    179:180:void com.android.tools.r8.graph.DexCode$TryHandler.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):607:608 -> a
-    179:180:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):465 -> a
-    181:183:void updateHighestSortingString(com.android.tools.r8.graph.DexString):481:483 -> a
-    184:186:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):493:495 -> a
-    187:187:void com.android.tools.r8.graph.DexDebugInfo.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):80:80 -> a
-    187:187:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):495 -> a
+    89:99:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):304:314 -> a
+    100:163:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):328:391 -> a
+    164:164:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):374:374 -> a
+    165:167:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):458:460 -> a
+    168:168:boolean com.android.tools.r8.code.Instruction.isDexItemBasedConstString():0:0 -> a
+    168:168:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):460 -> a
+    169:172:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):460:463 -> a
+    173:173:boolean com.android.tools.r8.code.Instruction.isConstStringJumbo():0:0 -> a
+    173:173:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):464 -> a
+    174:178:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):465:469 -> a
+    179:179:void com.android.tools.r8.graph.DexDebugInfo.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):68:68 -> a
+    179:179:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):469 -> a
+    180:180:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    180:180:void com.android.tools.r8.graph.DexDebugInfo.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):70 -> a
+    180:180:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):469 -> a
+    181:182:void com.android.tools.r8.graph.DexDebugInfo.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):73:74 -> a
+    181:182:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):469 -> a
+    183:183:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):471:471 -> a
+    184:185:void com.android.tools.r8.graph.DexCode$TryHandler.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):614:615 -> a
+    184:185:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):472 -> a
+    186:188:void updateHighestSortingString(com.android.tools.r8.graph.DexString):488:490 -> a
+    189:191:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):500:502 -> a
+    192:192:void com.android.tools.r8.graph.DexDebugInfo.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):80:80 -> a
+    192:192:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):502 -> a
     1:1:int lambda$specify$1(com.android.tools.r8.graph.DexCode):58:58 -> b
     1:1:int lambda$specify$2(com.android.tools.r8.graph.DexCode):59:59 -> c
     1:1:com.android.tools.r8.graph.DexCode$Try[] lambda$specify$3(com.android.tools.r8.graph.DexCode):60:60 -> d
@@ -58327,68 +58326,68 @@ com.android.tools.r8.graph.DexCode -> com.android.tools.r8.graph.M:
     2:2:boolean computeEquals(java.lang.Object):254:254 -> g
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():94:94 -> l
     com.android.tools.r8.utils.structural.StructuralItem self() -> q
-    1:1:java.lang.String toString():316:316 -> toString
+    1:1:java.lang.String toString():323:323 -> toString
 com.android.tools.r8.graph.DexCode$Try -> com.android.tools.r8.graph.M$a:
     boolean $assertionsDisabled -> e
     int handlerIndex -> d
     int startAddress -> b
     int instructionCount -> c
     int handlerOffset -> a
-    1:1:void <clinit>():505:505 -> <clinit>
-    1:5:void <init>(int,int,int):521:525 -> <init>
-    1:1:int lambda$specify$0(com.android.tools.r8.graph.DexCode$Try):516:516 -> a
-    2:4:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):516:518 -> a
-    5:5:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):565:565 -> a
-    1:1:int lambda$specify$1(com.android.tools.r8.graph.DexCode$Try):517:517 -> b
-    1:1:int lambda$specify$2(com.android.tools.r8.graph.DexCode$Try):518:518 -> c
-    1:1:boolean equals(java.lang.Object):549:549 -> equals
-    1:1:int hashCode():544:544 -> hashCode
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():535:535 -> l
+    1:1:void <clinit>():512:512 -> <clinit>
+    1:5:void <init>(int,int,int):528:532 -> <init>
+    1:1:int lambda$specify$0(com.android.tools.r8.graph.DexCode$Try):523:523 -> a
+    2:4:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):523:525 -> a
+    5:5:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):572:572 -> a
+    1:1:int lambda$specify$1(com.android.tools.r8.graph.DexCode$Try):524:524 -> b
+    1:1:int lambda$specify$2(com.android.tools.r8.graph.DexCode$Try):525:525 -> c
+    1:1:boolean equals(java.lang.Object):556:556 -> equals
+    1:1:int hashCode():551:551 -> hashCode
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():542:542 -> l
     com.android.tools.r8.utils.structural.StructuralItem self() -> q
-    1:4:java.lang.String toString():554:557 -> toString
+    1:4:java.lang.String toString():561:564 -> toString
 com.android.tools.r8.graph.DexCode$TryHandler -> com.android.tools.r8.graph.M$b:
     com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair[] pairs -> a
     int catchAllAddr -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():570:570 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair[],int):581:583 -> <init>
-    1:1:int lambda$specify$0(com.android.tools.r8.graph.DexCode$TryHandler):578:578 -> a
-    2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):578:578 -> a
-    3:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):615:615 -> a
-    1:1:com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair[] lambda$specify$1(com.android.tools.r8.graph.DexCode$TryHandler):578:578 -> b
-    1:1:boolean equals(java.lang.Object):603:603 -> equals
-    1:1:int hashCode():598:598 -> hashCode
+    1:1:void <clinit>():577:577 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair[],int):588:590 -> <init>
+    1:1:int lambda$specify$0(com.android.tools.r8.graph.DexCode$TryHandler):585:585 -> a
+    2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):585:585 -> a
+    3:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):622:622 -> a
+    1:1:com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair[] lambda$specify$1(com.android.tools.r8.graph.DexCode$TryHandler):585:585 -> b
+    1:1:boolean equals(java.lang.Object):610:610 -> equals
+    1:1:int hashCode():605:605 -> hashCode
     2:2:int com.android.tools.r8.utils.structural.HashCodeVisitor.run(com.android.tools.r8.utils.structural.StructuralItem):28:28 -> hashCode
-    2:2:int hashCode():598 -> hashCode
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():593:593 -> l
+    2:2:int hashCode():605 -> hashCode
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():600:600 -> l
     com.android.tools.r8.utils.structural.StructuralItem self() -> q
-    1:16:java.lang.String toString():620:635 -> toString
+    1:16:java.lang.String toString():627:642 -> toString
 com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair -> com.android.tools.r8.graph.M$b$a:
     com.android.tools.r8.graph.DexType type -> a
     int addr -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():638:638 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexType,int):647:649 -> <init>
-    1:1:com.android.tools.r8.graph.DexType access$000(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair):638:638 -> a
-    2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):644:644 -> a
-    3:3:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.GraphLens):667:667 -> a
-    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):671 -> a
+    1:1:void <clinit>():645:645 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexType,int):654:656 -> <init>
+    1:1:com.android.tools.r8.graph.DexType access$000(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair):645:645 -> a
+    2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):651:651 -> a
+    3:3:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.GraphLens):674:674 -> a
+    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):678 -> a
     4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):352:352 -> a
-    4:4:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.GraphLens):667 -> a
-    4:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):671 -> a
-    5:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):672:672 -> a
-    6:6:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.GraphLens):667:667 -> a
+    4:4:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.GraphLens):674 -> a
+    4:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):678 -> a
+    5:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):679:679 -> a
+    6:6:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.GraphLens):674:674 -> a
     7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):352:352 -> a
-    7:7:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.GraphLens):667 -> a
-    8:8:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):678:678 -> a
-    1:1:com.android.tools.r8.graph.DexType lambda$specify$0(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair):644:644 -> b
-    1:1:int lambda$specify$1(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair):644:644 -> c
-    1:1:boolean equals(java.lang.Object):688:688 -> equals
-    1:1:com.android.tools.r8.graph.DexType getType():663:663 -> getType
-    1:1:int hashCode():683:683 -> hashCode
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():659:659 -> l
+    7:7:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.GraphLens):674 -> a
+    8:8:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):685:685 -> a
+    1:1:com.android.tools.r8.graph.DexType lambda$specify$0(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair):651:651 -> b
+    1:1:int lambda$specify$1(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair):651:651 -> c
+    1:1:boolean equals(java.lang.Object):695:695 -> equals
+    1:1:com.android.tools.r8.graph.DexType getType():670:670 -> getType
+    1:1:int hashCode():690:690 -> hashCode
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():666:666 -> l
     com.android.tools.r8.utils.structural.StructuralItem self() -> q
-com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.internal.IL0:
+com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.internal.LL0:
     com.android.tools.r8.ir.code.Position callerPosition -> i
     com.android.tools.r8.graph.DexString sourceFile -> d
     boolean $assertionsDisabled -> j
@@ -58724,7 +58723,7 @@ com.android.tools.r8.graph.DexDebugInfo -> com.android.tools.r8.graph.a0:
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():44:44 -> l
     com.android.tools.r8.utils.structural.StructuralItem self() -> q
     1:8:java.lang.String toString():85:92 -> toString
-com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.internal.JL0:
+com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.internal.ML0:
     1:5:void <init>(com.android.tools.r8.graph.DexDebugInfo):17:17 -> <init>
     1:1:boolean lambda$new$0(com.android.tools.r8.graph.DexDebugEvent):19:19 -> a
     1:1:com.android.tools.r8.graph.DexDebugEvent[] lambda$new$1(int):20:20 -> g
@@ -58799,7 +58798,7 @@ com.android.tools.r8.graph.DexDefinition -> com.android.tools.r8.graph.c0:
     2:2:void setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):48:48 -> s
     2:2:void clearAnnotations():40 -> s
     2:2:void clearAllAnnotations():44 -> s
-com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.internal.KL0:
+com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.internal.NL0:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory() -> a
     1:1:com.android.tools.r8.graph.DexClass contextIndependentDefinitionFor(com.android.tools.r8.graph.DexType):18:18 -> a
     2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
@@ -58852,7 +58851,7 @@ com.android.tools.r8.graph.DexEncodedArray -> com.android.tools.r8.graph.e0:
     1:1:boolean equals(java.lang.Object):39:39 -> equals
     1:1:int hashCode():31:31 -> hashCode
     1:1:java.lang.String toString():44:44 -> toString
-com.android.tools.r8.graph.DexEncodedField -> com.android.tools.r8.graph.g0:
+com.android.tools.r8.graph.DexEncodedField -> com.android.tools.r8.graph.h0:
     com.android.tools.r8.graph.FieldAccessFlags accessFlags -> f
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexEncodedField[] EMPTY_ARRAY -> l
@@ -58861,81 +58860,85 @@ com.android.tools.r8.graph.DexEncodedField -> com.android.tools.r8.graph.g0:
     boolean deprecated -> h
     com.android.tools.r8.graph.DexValue staticValue -> g
     com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo optimizationInfo -> j
-    1:7:void <clinit>():32:38 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue,boolean):79:79 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue,boolean,boolean,com.android.tools.r8.utils.AndroidApiLevel):99:99 -> <init>
-    3:62:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue,boolean,boolean,com.android.tools.r8.utils.AndroidApiLevel):46:105 -> <init>
-    1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinInfo():156:156 -> A
+    1:4:void <clinit>():32:35 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue,boolean,boolean,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedField$1):32:32 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue,boolean,boolean,com.android.tools.r8.utils.AndroidApiLevel):65:65 -> <init>
+    3:31:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue,boolean,boolean,com.android.tools.r8.utils.AndroidApiLevel):43:71 -> <init>
+    1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinInfo():122:122 -> A
     1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo():32 -> A
-    1:1:java.lang.String toSourceString():191:191 -> L
+    1:1:java.lang.String toSourceString():157:157 -> L
     com.android.tools.r8.graph.DexEncodedField asDexEncodedField() -> O
-    1:1:boolean isStatic():242:242 -> Y
-    1:1:boolean isStaticMember():259 -> Y
-    1:1:void clearKotlinInfo():161:161 -> Z
-    1:1:com.android.tools.r8.graph.DexValue access$000(com.android.tools.r8.graph.DexEncodedField):32:32 -> a
-    2:2:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo access$102(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo):32:32 -> a
-    3:8:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):50:55 -> a
-    9:9:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):151:151 -> a
-    10:11:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinFieldLevelInfo):170:171 -> a
-    12:12:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):176:176 -> a
-    13:13:java.lang.Object apply(java.util.function.Function,java.util.function.Function):220:220 -> a
-    14:16:void setStaticValue(com.android.tools.r8.graph.DexValue):276:278 -> a
-    17:17:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):298:298 -> a
-    18:18:boolean isStatic():242:242 -> a
-    18:18:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):301 -> a
-    19:20:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):301:302 -> a
-    21:21:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():136:136 -> a
-    21:21:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):306 -> a
-    22:32:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):306:316 -> a
-    33:40:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):315:322 -> a
-    41:41:boolean isStatic():242:242 -> a
-    41:41:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):322 -> a
-    42:48:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):323:329 -> a
-    49:49:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField,java.util.function.Consumer):341:341 -> a
-    50:50:com.android.tools.r8.graph.DexEncodedField$Builder builder(com.android.tools.r8.graph.DexEncodedField):382:382 -> a
-    50:50:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField,java.util.function.Consumer):344 -> a
-    51:51:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField,java.util.function.Consumer):344:344 -> a
-    52:52:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.apply(java.util.function.Consumer):418:418 -> a
-    52:52:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField,java.util.function.Consumer):344 -> a
-    53:53:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField,java.util.function.Consumer):344:344 -> a
-    54:61:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):348:355 -> a
-    62:62:boolean com.android.tools.r8.graph.DexValue.isDexValueNull():0:0 -> a
-    62:62:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):355 -> a
-    63:64:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):356:357 -> a
-    65:66:void setGenericSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):368:369 -> a
-    1:1:com.android.tools.r8.utils.AndroidApiLevel getApiLevel():141:141 -> a0
-    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo access$100(com.android.tools.r8.graph.DexEncodedField):32:32 -> b
-    1:1:com.android.tools.r8.graph.DexValue lambda$specify$0(com.android.tools.r8.graph.DexEncodedField):52:52 -> c
-    1:1:boolean lambda$specify$1(com.android.tools.r8.graph.DexEncodedField):55:55 -> d
-    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():136:136 -> e0
+    1:1:boolean isStatic():208:208 -> Y
+    1:1:boolean isStaticMember():225 -> Y
+    1:1:void clearKotlinInfo():127:127 -> Z
+    1:1:com.android.tools.r8.graph.DexValue access$200(com.android.tools.r8.graph.DexEncodedField):32:32 -> a
+    2:2:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo access$302(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo):32:32 -> a
+    3:8:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):47:52 -> a
+    9:9:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):117:117 -> a
+    10:11:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinFieldLevelInfo):136:137 -> a
+    12:12:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):142:142 -> a
+    13:13:java.lang.Object apply(java.util.function.Function,java.util.function.Function):186:186 -> a
+    14:16:void setStaticValue(com.android.tools.r8.graph.DexValue):242:244 -> a
+    17:17:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):264:264 -> a
+    18:18:boolean isStatic():208:208 -> a
+    18:18:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):267 -> a
+    19:20:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):267:268 -> a
+    21:21:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():102:102 -> a
+    21:21:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):272 -> a
+    22:32:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):272:282 -> a
+    33:33:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
+    33:33:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):281 -> a
+    34:34:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):288:288 -> a
+    35:35:boolean isStatic():208:208 -> a
+    35:35:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):288 -> a
+    36:42:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):289:295 -> a
+    43:43:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField,java.util.function.Consumer):307:307 -> a
+    44:44:com.android.tools.r8.graph.DexEncodedField$Builder builder(com.android.tools.r8.graph.DexEncodedField):348:348 -> a
+    44:44:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField,java.util.function.Consumer):310 -> a
+    45:45:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField,java.util.function.Consumer):310:310 -> a
+    46:46:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.apply(java.util.function.Consumer):390:390 -> a
+    46:46:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField,java.util.function.Consumer):310 -> a
+    47:47:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField,java.util.function.Consumer):310:310 -> a
+    48:55:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):314:321 -> a
+    56:56:boolean com.android.tools.r8.graph.DexValue.isDexValueNull():0:0 -> a
+    56:56:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):321 -> a
+    57:58:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):322:323 -> a
+    59:60:void setGenericSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):334:335 -> a
+    1:1:com.android.tools.r8.utils.AndroidApiLevel getApiLevel():107:107 -> a0
+    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo access$300(com.android.tools.r8.graph.DexEncodedField):32:32 -> b
+    1:1:com.android.tools.r8.graph.DexValue lambda$specify$0(com.android.tools.r8.graph.DexEncodedField):49:49 -> c
+    1:1:boolean lambda$specify$1(com.android.tools.r8.graph.DexEncodedField):52:52 -> d
+    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():102:102 -> e0
     1:1:com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo getOptimizationInfo():32 -> e0
     1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():32:32 -> getAccessFlags
-    1:1:com.android.tools.r8.graph.DexType getType():195:195 -> getType
+    1:1:com.android.tools.r8.graph.DexType getType():161:161 -> getType
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> getType
-    2:2:com.android.tools.r8.graph.DexType getType():195 -> getType
-    1:1:com.android.tools.r8.graph.DexEncodedField$Builder builder():378:378 -> i0
-    1:2:void clearStaticValue():282:283 -> j0
-    1:1:com.android.tools.r8.graph.FieldAccessFlags getAccessFlags():166:166 -> k0
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():110:110 -> l
-    1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature getGenericSignature():364:364 -> l0
-    1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinInfo():156:156 -> m0
-    1:2:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():145:146 -> n0
-    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():136:136 -> o0
-    1:1:void clearGenericSignature():374:374 -> p
-    1:2:com.android.tools.r8.graph.DexValue getStaticValue():287:288 -> p0
+    2:2:com.android.tools.r8.graph.DexType getType():161 -> getType
+    1:1:com.android.tools.r8.graph.DexEncodedField$Builder builder():344:344 -> i0
+    1:2:void clearStaticValue():248:249 -> j0
+    1:1:com.android.tools.r8.graph.FieldAccessFlags getAccessFlags():132:132 -> k0
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():76:76 -> l
+    1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature getGenericSignature():330:330 -> l0
+    1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinInfo():122:122 -> m0
+    1:2:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():111:112 -> n0
+    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():102:102 -> o0
+    1:1:void clearGenericSignature():340:340 -> p
+    1:2:com.android.tools.r8.graph.DexValue getStaticValue():253:254 -> p0
     com.android.tools.r8.utils.structural.StructuralItem self() -> q
-    1:2:boolean hasExplicitStaticValue():271:272 -> q0
-    1:1:boolean isDeprecated():123:123 -> r0
-    1:1:boolean isEnum():233:233 -> s0
+    1:2:boolean hasExplicitStaticValue():237:238 -> q0
+    1:1:boolean isDeprecated():89:89 -> r0
+    1:1:boolean isEnum():199:199 -> s0
     2:2:boolean com.android.tools.r8.graph.FieldAccessFlags.isEnum():124:124 -> s0
-    2:2:boolean isEnum():233 -> s0
-    1:1:boolean isPublic():254:254 -> t0
-    1:1:java.lang.String toString():181:181 -> toString
-    1:1:boolean isVolatile():267:267 -> u0
+    2:2:boolean isEnum():199 -> s0
+    1:1:boolean isPublic():220:220 -> t0
+    1:1:java.lang.String toString():147:147 -> toString
+    1:1:boolean isVolatile():233:233 -> u0
     2:2:boolean com.android.tools.r8.graph.FieldAccessFlags.isVolatile():108:108 -> u0
-    2:2:boolean isVolatile():267 -> u0
-    1:1:com.android.tools.r8.graph.DexType type():119:119 -> v0
-com.android.tools.r8.graph.DexEncodedField$Builder -> com.android.tools.r8.graph.f0:
+    2:2:boolean isVolatile():233 -> u0
+    1:1:com.android.tools.r8.graph.DexEncodedField$Builder syntheticBuilder():352:352 -> v0
+    1:1:com.android.tools.r8.graph.DexType type():85:85 -> w0
+com.android.tools.r8.graph.DexEncodedField$1 -> com.android.tools.r8.graph.f0:
+com.android.tools.r8.graph.DexEncodedField$Builder -> com.android.tools.r8.graph.g0:
     com.android.tools.r8.graph.DexAnnotationSet annotations -> b
     com.android.tools.r8.utils.AndroidApiLevel apiLevel -> f
     com.android.tools.r8.graph.FieldAccessFlags accessFlags -> c
@@ -58947,25 +58950,30 @@ com.android.tools.r8.graph.DexEncodedField$Builder -> com.android.tools.r8.graph
     com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo optimizationInfo -> g
     com.android.tools.r8.graph.DexValue staticValue -> e
     java.util.function.Consumer buildConsumer -> j
-    1:1:void <clinit>():385:385 -> <clinit>
-    1:1:void <init>():398:398 -> <init>
-    2:10:void <init>():388:396 -> <init>
-    11:11:void <init>(com.android.tools.r8.graph.DexEncodedField):400:400 -> <init>
-    12:38:void <init>(com.android.tools.r8.graph.DexEncodedField):388:414 -> <init>
-    1:1:com.android.tools.r8.graph.DexEncodedField$Builder modifyAccessFlags(java.util.function.Consumer):423:423 -> a
-    2:2:com.android.tools.r8.graph.DexEncodedField$Builder setAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.AppView):429:429 -> a
-    3:3:com.android.tools.r8.graph.DexEncodedField$Builder addBuildConsumer(java.util.function.Consumer):445:445 -> a
-    3:3:com.android.tools.r8.graph.DexEncodedField$Builder setAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.AppView):429 -> a
-    4:5:void lambda$setAbstractValue$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexEncodedField):431:432 -> a
-    6:6:com.android.tools.r8.graph.DexEncodedField$Builder setField(com.android.tools.r8.graph.DexField):450:450 -> a
-    7:7:com.android.tools.r8.graph.DexEncodedField$Builder setAccessFlags(com.android.tools.r8.graph.FieldAccessFlags):455:455 -> a
-    8:8:com.android.tools.r8.graph.DexEncodedField$Builder setApiLevel(com.android.tools.r8.utils.AndroidApiLevel):465:465 -> a
-    9:25:com.android.tools.r8.graph.DexEncodedField build():470:486 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedField$Builder clearAnnotations():436:436 -> b
-    2:2:com.android.tools.r8.graph.DexEncodedField$Builder setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):440:440 -> b
-    2:2:com.android.tools.r8.graph.DexEncodedField$Builder clearAnnotations():436 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedField$Builder setD8R8Synthesized():460:460 -> c
-com.android.tools.r8.graph.DexEncodedMember -> com.android.tools.r8.internal.LL0:
+    1:1:void <clinit>():355:355 -> <clinit>
+    1:1:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField$1):355:355 -> <init>
+    2:2:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField$1):355:355 -> <init>
+    3:3:void <init>(boolean):368:368 -> <init>
+    4:15:void <init>(boolean):358:369 -> <init>
+    16:16:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):372:372 -> <init>
+    17:45:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):358:386 -> <init>
+    1:1:com.android.tools.r8.graph.DexEncodedField$Builder modifyAccessFlags(java.util.function.Consumer):395:395 -> a
+    2:2:com.android.tools.r8.graph.DexEncodedField$Builder setAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.AppView):401:401 -> a
+    3:3:com.android.tools.r8.graph.DexEncodedField$Builder addBuildConsumer(java.util.function.Consumer):417:417 -> a
+    3:3:com.android.tools.r8.graph.DexEncodedField$Builder setAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.AppView):401 -> a
+    4:5:void lambda$setAbstractValue$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexEncodedField):403:404 -> a
+    6:6:com.android.tools.r8.graph.DexEncodedField$Builder setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):412:412 -> a
+    7:7:com.android.tools.r8.graph.DexEncodedField$Builder setField(com.android.tools.r8.graph.DexField):422:422 -> a
+    8:8:com.android.tools.r8.graph.DexEncodedField$Builder setAccessFlags(com.android.tools.r8.graph.FieldAccessFlags):427:427 -> a
+    9:9:com.android.tools.r8.graph.DexEncodedField$Builder setApiLevel(com.android.tools.r8.utils.AndroidApiLevel):432:432 -> a
+    10:10:com.android.tools.r8.graph.DexEncodedField$Builder setGenericSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):437:437 -> a
+    11:11:com.android.tools.r8.graph.DexEncodedField$Builder setStaticValue(com.android.tools.r8.graph.DexValue):442:442 -> a
+    12:12:com.android.tools.r8.graph.DexEncodedField$Builder setDeprecated(boolean):447:447 -> a
+    13:28:com.android.tools.r8.graph.DexEncodedField build():452:467 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedField$Builder clearAnnotations():408:408 -> b
+    2:2:com.android.tools.r8.graph.DexEncodedField$Builder setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):412:412 -> b
+    2:2:com.android.tools.r8.graph.DexEncodedField$Builder clearAnnotations():408 -> b
+com.android.tools.r8.graph.DexEncodedMember -> com.android.tools.r8.internal.OL0:
     com.android.tools.r8.utils.AndroidApiLevel apiLevelForDefinition -> d
     boolean d8R8Synthesized -> c
     com.android.tools.r8.graph.DexMember reference -> e
@@ -59010,407 +59018,414 @@ com.android.tools.r8.graph.DexEncodedMethod -> com.android.tools.r8.graph.j0:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> j
     com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo callSiteOptimizationInfo -> l
     com.android.tools.r8.kotlin.KotlinMethodLevelInfo kotlinMemberInfo -> o
-    1:53:void <clinit>():97:149 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):232:232 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):253:253 -> <init>
-    3:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):277:277 -> <init>
-    4:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,boolean):303:303 -> <init>
-    5:161:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,boolean):158:314 -> <init>
-    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinInfo():627:627 -> A
-    1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo():97 -> A
-    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1403:1404 -> A0
-    1:1:com.android.tools.r8.graph.ParameterAnnotationsList getParameterAnnotations():920:920 -> B0
-    1:1:java.util.Map getParameterInfo():799:799 -> C0
-    1:1:com.android.tools.r8.graph.DexTypeList getParameters():381:381 -> D0
-    2:2:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():77:77 -> D0
-    2:2:com.android.tools.r8.graph.DexTypeList getParameters():381 -> D0
-    1:1:com.android.tools.r8.graph.DexProto getProto():373:373 -> E0
-    1:1:com.android.tools.r8.graph.DexMethodSignature getSignature():389:389 -> F0
-    2:2:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexMethod):17:17 -> F0
-    2:2:com.android.tools.r8.graph.DexMethodSignature getSignature():389 -> F0
-    1:2:boolean hasClassFileVersion():852:853 -> G0
-    1:1:boolean hasCode():828:828 -> H0
-    1:1:boolean hasParameterInfo():795:795 -> I0
-    1:1:boolean isAbstract():469:469 -> J0
-    1:1:boolean isBridge():473:473 -> K0
-    1:2:java.lang.String toSourceString():953:954 -> L
-    1:2:boolean isClassInitializer():526:527 -> L0
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():199:199 -> L0
-    3:3:boolean isClassInitializer():527 -> L0
-    4:4:boolean isClassInitializer():527:527 -> L0
-    1:1:boolean isDefaultMethod():532:532 -> M0
-    1:2:boolean isDirectMethod():589:590 -> N0
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():199:199 -> N0
-    3:3:boolean isDirectMethod():590 -> N0
-    4:4:boolean isDirectMethod():590:590 -> N0
-    1:1:boolean isFinal():477:477 -> O0
-    1:2:boolean isInitializer():493:494 -> P0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1393:1393 -> Q
-    1:2:boolean isInstanceInitializer():498:499 -> Q0
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():199:199 -> Q0
-    3:3:boolean isInstanceInitializer():499 -> Q0
-    4:4:boolean isInstanceInitializer():499:499 -> Q0
-    1:1:com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride():397:397 -> R0
-    1:1:boolean isNative():481:481 -> S0
-    1:1:boolean hasAnyAnnotations():892:892 -> T
-    2:2:boolean hasParameterAnnotations():924:924 -> T
-    2:2:boolean hasAnyAnnotations():892 -> T
-    1:2:boolean isNonAbstractNonNativeMethod():561:562 -> T0
-    1:2:boolean isNonAbstractVirtualMethod():556:557 -> U0
-    1:2:boolean isNonPrivateVirtualMethod():547:548 -> V0
-    1:1:boolean isObsolete():186:186 -> W0
-    1:1:boolean isDexEncodedMethod():1387:1387 -> X
-    1:1:boolean isOnlyInlinedIntoNestMembers():658:658 -> X0
-    1:2:boolean isStaticMember():605:606 -> Y
-    1:2:boolean isPrivateMethod():581:582 -> Y0
-    1:1:void clearKotlinInfo():632:632 -> Z
-    1:2:boolean isProcessed():464:465 -> Z0
-    1:1:com.android.tools.r8.cf.CfVersion access$300(com.android.tools.r8.graph.DexEncodedMethod):97:97 -> a
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$402(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):97:97 -> a
-    3:3:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$502(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):97:97 -> a
-    4:13:void syntheticSpecify(com.android.tools.r8.utils.structural.StructuralSpecification):338:347 -> a
-    14:20:int compareCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.CompareToVisitor):354:360 -> a
-    21:24:void hashCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.HashingVisitor):365:368 -> a
+    1:56:void <clinit>():98:153 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,boolean,com.android.tools.r8.graph.DexEncodedMethod$1):98:98 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,boolean):245:245 -> <init>
+    3:97:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,boolean):162:256 -> <init>
+    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinInfo():569:569 -> A
+    1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo():98 -> A
+    1:1:int getNumberOfArguments():213:213 -> A0
+    2:2:boolean isInstance():536:536 -> A0
+    2:2:int getNumberOfArguments():213 -> A0
+    3:3:int getNumberOfArguments():213:213 -> A0
+    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1346:1347 -> B0
+    1:1:com.android.tools.r8.graph.ParameterAnnotationsList getParameterAnnotations():862:862 -> C0
+    1:1:java.util.Map getParameterInfo():741:741 -> D0
+    1:1:com.android.tools.r8.graph.DexTypeList getParameters():323:323 -> E0
+    2:2:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():77:77 -> E0
+    2:2:com.android.tools.r8.graph.DexTypeList getParameters():323 -> E0
+    1:1:com.android.tools.r8.graph.DexProto getProto():315:315 -> F0
+    1:1:com.android.tools.r8.graph.DexMethodSignature getSignature():331:331 -> G0
+    2:2:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexMethod):17:17 -> G0
+    2:2:com.android.tools.r8.graph.DexMethodSignature getSignature():331 -> G0
+    1:2:boolean hasClassFileVersion():794:795 -> H0
+    1:1:boolean hasCode():770:770 -> I0
+    1:1:boolean hasParameterInfo():737:737 -> J0
+    1:1:boolean isAbstract():411:411 -> K0
+    1:2:java.lang.String toSourceString():895:896 -> L
+    1:1:boolean isBridge():415:415 -> L0
+    1:2:boolean isClassInitializer():468:469 -> M0
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():199:199 -> M0
+    3:3:boolean isClassInitializer():469 -> M0
+    4:4:boolean isClassInitializer():469:469 -> M0
+    1:1:boolean isDefaultMethod():474:474 -> N0
+    1:1:boolean isDeprecated():264:264 -> O0
+    1:2:boolean isDirectMethod():531:532 -> P0
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():199:199 -> P0
+    3:3:boolean isDirectMethod():532 -> P0
+    4:4:boolean isDirectMethod():532:532 -> P0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1336:1336 -> Q
+    1:1:boolean isFinal():419:419 -> Q0
+    1:2:boolean isInitializer():435:436 -> R0
+    1:2:boolean isInstanceInitializer():440:441 -> S0
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():199:199 -> S0
+    3:3:boolean isInstanceInitializer():441 -> S0
+    4:4:boolean isInstanceInitializer():441:441 -> S0
+    1:1:boolean hasAnyAnnotations():834:834 -> T
+    2:2:boolean hasParameterAnnotations():866:866 -> T
+    2:2:boolean hasAnyAnnotations():834 -> T
+    1:1:com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride():339:339 -> T0
+    1:1:boolean isNative():423:423 -> U0
+    1:2:boolean isNonAbstractNonNativeMethod():503:504 -> V0
+    1:2:boolean isNonAbstractVirtualMethod():498:499 -> W0
+    1:1:boolean isDexEncodedMethod():1330:1330 -> X
+    1:2:boolean isNonPrivateVirtualMethod():489:490 -> X0
+    1:2:boolean isStaticMember():547:548 -> Y
+    1:1:boolean isObsolete():190:190 -> Y0
+    1:1:void clearKotlinInfo():574:574 -> Z
+    1:1:boolean isOnlyInlinedIntoNestMembers():600:600 -> Z0
+    1:1:com.android.tools.r8.cf.CfVersion access$200(com.android.tools.r8.graph.DexEncodedMethod):98:98 -> a
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$402(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):98:98 -> a
+    3:3:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$502(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):98:98 -> a
+    4:13:void syntheticSpecify(com.android.tools.r8.utils.structural.StructuralSpecification):280:289 -> a
+    14:20:int compareCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.CompareToVisitor):296:302 -> a
+    21:24:void hashCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.HashingVisitor):307:310 -> a
     25:25:void com.android.tools.r8.utils.structural.StructuralItem.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):86:86 -> a
-    25:25:void hashCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.HashingVisitor):368 -> a
-    26:29:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):401:404 -> a
-    30:36:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):403:409 -> a
-    37:42:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):408:413 -> a
-    43:45:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):417:419 -> a
-    46:46:java.lang.Object apply(java.util.function.Function,java.util.function.Function):432:432 -> a
-    47:48:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):436:437 -> a
-    47:48:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):455 -> a
+    25:25:void hashCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.HashingVisitor):310 -> a
+    26:29:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):343:346 -> a
+    30:36:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):345:351 -> a
+    37:42:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):350:355 -> a
+    43:45:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):359:361 -> a
+    46:46:java.lang.Object apply(java.util.function.Function,java.util.function.Function):374:374 -> a
+    47:48:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):378:379 -> a
+    47:48:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):397 -> a
     49:49:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    49:49:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):437 -> a
-    49:49:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):455 -> a
-    50:50:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):439:439 -> a
-    50:50:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):455 -> a
-    51:51:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    51:51:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):1058 -> a
-    52:67:com.android.tools.r8.graph.CfCode buildInstanceOfCfCode(com.android.tools.r8.graph.DexType,boolean):1064:1079 -> a
-    52:67:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):1059 -> a
-    68:75:com.android.tools.r8.graph.DexCode buildInstanceOfDexCode(com.android.tools.r8.graph.DexType,boolean):1083:1090 -> a
-    68:75:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):1060 -> a
-    76:76:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):517:517 -> a
-    77:78:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):507:508 -> a
-    77:78:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):517 -> a
-    79:79:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
-    79:79:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):508 -> a
-    79:79:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):517 -> a
-    80:81:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):509:510 -> a
-    80:81:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):517 -> a
-    82:83:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinMethodLevelInfo):645:646 -> a
-    84:86:boolean isInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):666:668 -> a
-    87:87:boolean isInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):667:667 -> a
-    88:143:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):676:731 -> a
-    144:147:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):716:719 -> a
-    148:151:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):709:712 -> a
-    152:155:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):702:705 -> a
-    156:188:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):695:727 -> a
-    189:208:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):736:755 -> a
-    209:209:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):752:752 -> a
-    210:210:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):749:749 -> a
-    211:211:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):746:746 -> a
-    212:212:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):743:743 -> a
-    213:231:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):740:758 -> a
-    232:235:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):767:770 -> a
-    236:236:boolean hasParameterInfo():795:795 -> a
-    236:236:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):770 -> a
-    237:238:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):770:771 -> a
-    239:240:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):790:791 -> a
-    239:240:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):771 -> a
-    241:241:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):773:773 -> a
-    242:244:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):777:779 -> a
-    245:248:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):783:786 -> a
-    249:250:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1403:1404 -> a
-    249:250:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):786 -> a
-    251:251:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):786:786 -> a
-    252:252:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):810:810 -> a
-    253:258:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):815:820 -> a
-    259:261:void downgradeClassFileVersion(com.android.tools.r8.cf.CfVersion):863:865 -> a
-    262:270:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):879:887 -> a
-    271:271:void rewriteAllAnnotations(java.util.function.BiFunction):905:905 -> a
-    272:276:void rewriteAllAnnotations(java.util.function.BiFunction):904:908 -> a
-    277:277:void setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):928:928 -> a
-    277:277:void rewriteAllAnnotations(java.util.function.BiFunction):906 -> a
-    278:283:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):932:937 -> a
+    49:49:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):379 -> a
+    49:49:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):397 -> a
+    50:50:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):381:381 -> a
+    50:50:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):397 -> a
+    51:51:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):459:459 -> a
+    52:53:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):449:450 -> a
+    52:53:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):459 -> a
+    54:54:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    54:54:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):450 -> a
+    54:54:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):459 -> a
+    55:56:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):451:452 -> a
+    55:56:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):459 -> a
+    57:57:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    57:57:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):1000 -> a
+    58:73:com.android.tools.r8.graph.CfCode buildInstanceOfCfCode(com.android.tools.r8.graph.DexType,boolean):1006:1021 -> a
+    58:73:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):1001 -> a
+    74:81:com.android.tools.r8.graph.DexCode buildInstanceOfDexCode(com.android.tools.r8.graph.DexType,boolean):1025:1032 -> a
+    74:81:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):1002 -> a
+    82:83:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinMethodLevelInfo):587:588 -> a
+    84:86:boolean isInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):608:610 -> a
+    87:87:boolean isInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):609:609 -> a
+    88:143:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):618:673 -> a
+    144:147:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):658:661 -> a
+    148:151:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):651:654 -> a
+    152:155:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):644:647 -> a
+    156:188:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):637:669 -> a
+    189:208:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):678:697 -> a
+    209:209:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):694:694 -> a
+    210:210:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):691:691 -> a
+    211:211:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):688:688 -> a
+    212:212:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):685:685 -> a
+    213:231:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):682:700 -> a
+    232:235:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):709:712 -> a
+    236:236:boolean hasParameterInfo():737:737 -> a
+    236:236:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):712 -> a
+    237:238:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):712:713 -> a
+    239:240:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):732:733 -> a
+    239:240:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):713 -> a
+    241:241:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):715:715 -> a
+    242:244:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):719:721 -> a
+    245:248:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):725:728 -> a
+    249:250:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1346:1347 -> a
+    249:250:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):728 -> a
+    251:251:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):728:728 -> a
+    252:252:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):752:752 -> a
+    253:258:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):757:762 -> a
+    259:261:void downgradeClassFileVersion(com.android.tools.r8.cf.CfVersion):805:807 -> a
+    262:270:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):821:829 -> a
+    271:271:void rewriteAllAnnotations(java.util.function.BiFunction):847:847 -> a
+    272:276:void rewriteAllAnnotations(java.util.function.BiFunction):846:850 -> a
+    277:277:void setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):870:870 -> a
+    277:277:void rewriteAllAnnotations(java.util.function.BiFunction):848 -> a
+    278:283:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):874:879 -> a
     284:284:java.lang.String com.android.tools.r8.graph.DexItem.toSmaliString():44:44 -> a
-    284:284:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):937 -> a
-    285:286:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):937:938 -> a
+    284:284:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):879 -> a
+    285:286:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):879:880 -> a
     287:287:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():118:118 -> a
     287:287:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():114 -> a
-    287:287:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):938 -> a
-    288:294:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):938:944 -> a
-    295:350:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):388:443 -> a
-    295:350:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):945 -> a
-    351:354:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):945:948 -> a
-    355:364:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):981:990 -> a
-    365:372:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode(com.android.tools.r8.graph.DexMethod):1042:1049 -> a
-    373:375:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1095:1097 -> a
-    376:376:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    376:376:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1097 -> a
-    377:377:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1098:1098 -> a
-    378:383:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1153:1158 -> a
-    378:383:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1098 -> a
-    384:395:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1156:1167 -> a
-    384:395:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1098 -> a
-    396:404:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1164:1172 -> a
-    396:404:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1098 -> a
-    405:413:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1169:1177 -> a
-    405:413:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1098 -> a
-    414:418:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1175:1179 -> a
-    414:418:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1098 -> a
-    419:420:boolean isStaticMember():605:606 -> a
-    419:420:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1180 -> a
-    419:420:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1098 -> a
-    421:440:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1184:1203 -> a
-    421:440:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1098 -> a
-    441:441:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1099:1099 -> a
-    442:447:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1121:1126 -> a
-    442:447:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1099 -> a
-    448:458:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1124:1134 -> a
-    448:458:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1099 -> a
-    459:465:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1133:1139 -> a
-    459:465:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1099 -> a
-    466:470:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1137:1141 -> a
-    466:470:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1099 -> a
-    471:477:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1096:1102 -> a
-    478:478:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1100:1100 -> a
-    479:479:void setObsolete():192:192 -> a
-    479:479:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1103 -> a
-    480:480:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1104:1104 -> a
-    481:485:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):1108:1112 -> a
-    486:491:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):1111:1116 -> a
-    492:509:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):1212:1229 -> a
-    510:511:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1233:1234 -> a
+    287:287:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):880 -> a
+    288:294:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):880:886 -> a
+    295:350:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):395:450 -> a
+    295:350:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):887 -> a
+    351:354:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):887:890 -> a
+    355:364:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):923:932 -> a
+    365:372:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode(com.android.tools.r8.graph.DexMethod):984:991 -> a
+    373:375:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1037:1039 -> a
+    376:376:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    376:376:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1039 -> a
+    377:377:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1040:1040 -> a
+    378:383:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1095:1100 -> a
+    378:383:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1040 -> a
+    384:395:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1098:1109 -> a
+    384:395:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1040 -> a
+    396:404:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1106:1114 -> a
+    396:404:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1040 -> a
+    405:413:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1111:1119 -> a
+    405:413:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1040 -> a
+    414:418:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1117:1121 -> a
+    414:418:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1040 -> a
+    419:420:boolean isStaticMember():547:548 -> a
+    419:420:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1122 -> a
+    419:420:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1040 -> a
+    421:440:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1126:1145 -> a
+    421:440:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1040 -> a
+    441:441:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1041:1041 -> a
+    442:447:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1063:1068 -> a
+    442:447:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1041 -> a
+    448:458:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1066:1076 -> a
+    448:458:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1041 -> a
+    459:465:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1075:1081 -> a
+    459:465:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1041 -> a
+    466:470:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1079:1083 -> a
+    466:470:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1041 -> a
+    471:477:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1038:1044 -> a
+    478:478:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1042:1042 -> a
+    479:479:void setObsolete():196:196 -> a
+    479:479:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1045 -> a
+    480:480:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1046:1046 -> a
+    481:485:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):1050:1054 -> a
+    486:491:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):1053:1058 -> a
+    492:509:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):1154:1171 -> a
+    510:511:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1175:1176 -> a
     512:512:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):302:302 -> a
-    512:512:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1234 -> a
-    513:514:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1234:1235 -> a
-    515:519:com.android.tools.r8.graph.ProgramMethod toPrivateSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1239:1243 -> a
-    520:520:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder(com.android.tools.r8.graph.DexEncodedMethod):1473:1473 -> a
-    520:520:com.android.tools.r8.graph.ProgramMethod toPrivateSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1245 -> a
-    521:529:com.android.tools.r8.graph.ProgramMethod toPrivateSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1246:1254 -> a
-    530:533:void lambda$toPrivateSyntheticMethod$6(com.android.tools.r8.graph.MethodAccessFlags):1249:1252 -> a
-    534:534:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1259:1259 -> a
+    512:512:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1176 -> a
+    513:514:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1176:1177 -> a
+    515:519:com.android.tools.r8.graph.ProgramMethod toPrivateSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1181:1185 -> a
+    520:520:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder(com.android.tools.r8.graph.DexEncodedMethod):1420:1420 -> a
+    520:520:com.android.tools.r8.graph.ProgramMethod toPrivateSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1187 -> a
+    521:529:com.android.tools.r8.graph.ProgramMethod toPrivateSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1188:1196 -> a
+    530:533:void lambda$toPrivateSyntheticMethod$6(com.android.tools.r8.graph.MethodAccessFlags):1191:1194 -> a
+    534:534:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1201:1201 -> a
     535:535:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():679:679 -> a
     535:535:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):298 -> a
-    535:535:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1259 -> a
+    535:535:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1201 -> a
     536:536:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):302:302 -> a
     536:536:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):298 -> a
-    536:536:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1259 -> a
-    537:543:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1260:1266 -> a
+    536:536:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1201 -> a
+    537:543:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1202:1208 -> a
     544:544:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():234:234 -> a
-    544:544:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1266 -> a
-    545:545:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder(com.android.tools.r8.graph.DexEncodedMethod):1473:1473 -> a
-    545:545:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1268 -> a
-    546:552:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1269:1275 -> a
-    553:553:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.applyIf(boolean,java.util.function.Consumer):1538:1538 -> a
-    553:553:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1274 -> a
-    554:556:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.applyIf(boolean,java.util.function.Consumer,java.util.function.Consumer):1544:1546 -> a
-    554:556:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.applyIf(boolean,java.util.function.Consumer):1538 -> a
-    554:556:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1274 -> a
-    557:557:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1305:1305 -> a
-    558:563:void lambda$toForwardingMethod$9(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1278:1283 -> a
+    544:544:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1208 -> a
+    545:545:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder(com.android.tools.r8.graph.DexEncodedMethod):1420:1420 -> a
+    545:545:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1210 -> a
+    546:552:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1211:1217 -> a
+    553:553:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.applyIf(boolean,java.util.function.Consumer):1489:1489 -> a
+    553:553:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1216 -> a
+    554:556:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.applyIf(boolean,java.util.function.Consumer,java.util.function.Consumer):1495:1497 -> a
+    554:556:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.applyIf(boolean,java.util.function.Consumer):1489 -> a
+    554:556:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1216 -> a
+    557:557:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1247:1247 -> a
+    558:563:void lambda$toForwardingMethod$9(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1220:1225 -> a
     564:566:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.applyIf(boolean,java.util.function.Consumer,java.util.function.Consumer):76:78 -> a
-    564:566:void lambda$toForwardingMethod$9(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1282 -> a
-    567:567:void lambda$toForwardingMethod$9(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1300:1300 -> a
-    568:593:void lambda$toForwardingMethod$9(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1279:1304 -> a
-    594:594:void lambda$toForwardingMethod$9(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1302:1302 -> a
-    595:600:void lambda$toForwardingMethod$7(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1286:1291 -> a
+    564:566:void lambda$toForwardingMethod$9(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1224 -> a
+    567:567:void lambda$toForwardingMethod$9(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1242:1242 -> a
+    568:593:void lambda$toForwardingMethod$9(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1221:1246 -> a
+    594:594:void lambda$toForwardingMethod$9(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1244:1244 -> a
+    595:600:void lambda$toForwardingMethod$7(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1228:1233 -> a
     601:601:boolean com.android.tools.r8.graph.DexType.isInterface(com.android.tools.r8.graph.DexDefinitionSupplier):351:351 -> a
-    601:601:void lambda$toForwardingMethod$7(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1291 -> a
-    602:602:void lambda$toForwardingMethod$7(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1287:1287 -> a
-    603:610:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1310:1317 -> a
+    601:601:void lambda$toForwardingMethod$7(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1233 -> a
+    602:602:void lambda$toForwardingMethod$7(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1229:1229 -> a
+    603:610:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1252:1259 -> a
     611:611:void com.android.tools.r8.graph.MethodAccessFlags.unsetAbstract():183:183 -> a
-    611:611:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1318 -> a
-    612:622:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1319:1329 -> a
-    623:634:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1351:1362 -> a
-    635:645:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1361:1371 -> a
-    646:647:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):1430:1431 -> a
-    648:649:void joinCallSiteOptimizationInfo(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo,com.android.tools.r8.graph.AppView):1446:1447 -> a
-    650:651:void setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1463:1464 -> a
-    1:1:com.android.tools.r8.utils.AndroidApiLevel getApiLevel():1418:1418 -> a0
-    2:2:com.android.tools.r8.utils.AndroidApiLevel getApiLevelForCode():1408:1408 -> a0
-    2:2:com.android.tools.r8.utils.AndroidApiLevel getApiLevel():1418 -> a0
-    3:3:com.android.tools.r8.utils.AndroidApiLevel getApiLevel():1419:1419 -> a0
-    1:2:boolean isPublicMethod():571:572 -> a1
-    1:2:com.android.tools.r8.graph.ProgramMethod asProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):445:446 -> b
-    1:2:com.android.tools.r8.graph.ProgramMethod asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):460 -> b
+    611:611:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1260 -> a
+    612:622:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1262:1272 -> a
+    623:629:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1267:1273 -> a
+    630:641:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1294:1305 -> a
+    642:652:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1304:1314 -> a
+    653:654:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):1373:1374 -> a
+    655:656:void joinCallSiteOptimizationInfo(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo,com.android.tools.r8.graph.AppView):1389:1390 -> a
+    657:658:void setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1406:1407 -> a
+    1:1:com.android.tools.r8.utils.AndroidApiLevel getApiLevel():1361:1361 -> a0
+    2:2:com.android.tools.r8.utils.AndroidApiLevel getApiLevelForCode():1351:1351 -> a0
+    2:2:com.android.tools.r8.utils.AndroidApiLevel getApiLevel():1361 -> a0
+    3:3:com.android.tools.r8.utils.AndroidApiLevel getApiLevel():1362:1362 -> a0
+    1:2:boolean isPrivateMethod():523:524 -> a1
+    1:2:com.android.tools.r8.graph.ProgramMethod asProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):387:388 -> b
+    1:2:com.android.tools.r8.graph.ProgramMethod asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):402 -> b
     3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> b
-    3:3:com.android.tools.r8.graph.ProgramMethod asProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):446 -> b
-    3:3:com.android.tools.r8.graph.ProgramMethod asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):460 -> b
-    4:6:com.android.tools.r8.graph.ProgramMethod asProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):446:448 -> b
-    4:6:com.android.tools.r8.graph.ProgramMethod asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):460 -> b
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> b
-    7:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):1000 -> b
-    8:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():1019:1021 -> b
-    8:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):1001 -> b
-    11:11:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():1038:1038 -> b
-    11:11:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():1022 -> b
-    11:11:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):1001 -> b
-    12:16:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():1022:1026 -> b
-    12:16:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):1001 -> b
-    17:17:void setObsolete():192:192 -> b
-    17:17:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():1027 -> b
-    17:17:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):1001 -> b
-    18:25:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex(boolean):1006:1013 -> b
-    18:25:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):1002 -> b
-    26:26:void setObsolete():192:192 -> b
-    26:26:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex(boolean):1014 -> b
-    26:26:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):1002 -> b
-    27:29:void upgradeClassFileVersion(com.android.tools.r8.cf.CfVersion):857:859 -> b
-    30:30:com.android.tools.r8.graph.DexAnnotation lambda$rewriteAllAnnotations$3(java.util.function.BiFunction,com.android.tools.r8.graph.DexAnnotation):905:905 -> b
-    31:32:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):1207:1208 -> b
-    33:38:void lambda$toForwardingMethod$8(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1294:1299 -> b
+    3:3:com.android.tools.r8.graph.ProgramMethod asProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):388 -> b
+    3:3:com.android.tools.r8.graph.ProgramMethod asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):402 -> b
+    4:6:com.android.tools.r8.graph.ProgramMethod asProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):388:390 -> b
+    4:6:com.android.tools.r8.graph.ProgramMethod asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):402 -> b
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> b
+    7:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):942 -> b
+    8:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():961:963 -> b
+    8:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):943 -> b
+    11:11:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():980:980 -> b
+    11:11:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():964 -> b
+    11:11:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):943 -> b
+    12:16:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():964:968 -> b
+    12:16:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):943 -> b
+    17:17:void setObsolete():196:196 -> b
+    17:17:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():969 -> b
+    17:17:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):943 -> b
+    18:25:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex(boolean):948:955 -> b
+    18:25:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):944 -> b
+    26:26:void setObsolete():196:196 -> b
+    26:26:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex(boolean):956 -> b
+    26:26:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):944 -> b
+    27:29:void upgradeClassFileVersion(com.android.tools.r8.cf.CfVersion):799:801 -> b
+    30:30:com.android.tools.r8.graph.DexAnnotation lambda$rewriteAllAnnotations$3(java.util.function.BiFunction,com.android.tools.r8.graph.DexAnnotation):847:847 -> b
+    31:32:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):1149:1150 -> b
+    33:38:void lambda$toForwardingMethod$8(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1236:1241 -> b
     39:39:boolean com.android.tools.r8.graph.DexType.isInterface(com.android.tools.r8.graph.DexDefinitionSupplier):351:351 -> b
-    39:39:void lambda$toForwardingMethod$8(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1299 -> b
-    40:40:void lambda$toForwardingMethod$8(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1295:1295 -> b
-    41:50:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis(com.android.tools.r8.graph.AppView):1334:1343 -> b
-    51:51:void setObsolete():192:192 -> b
-    51:51:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis(com.android.tools.r8.graph.AppView):1344 -> b
-    52:53:void setApiLevelForCode(com.android.tools.r8.utils.AndroidApiLevel):1412:1413 -> b
-    54:54:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1481:1481 -> b
-    1:2:boolean isPublicized():566:567 -> b1
-    1:1:com.android.tools.r8.graph.DexAnnotation lambda$rewriteAllAnnotations$4(java.util.function.BiFunction,com.android.tools.r8.graph.DexAnnotation):908:908 -> c
-    2:4:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1451:1453 -> c
-    5:5:com.android.tools.r8.utils.AndroidApiLevel getApiLevelForCode():1408:1408 -> c
-    5:5:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1455 -> c
-    6:6:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1455:1455 -> c
-    1:2:boolean isStatic():599:600 -> c1
-    1:1:com.android.tools.r8.graph.ParameterAnnotationsList lambda$syntheticSpecify$0(com.android.tools.r8.graph.DexEncodedMethod):341:341 -> d
-    1:1:boolean isSynchronized():489:489 -> d1
-    1:1:com.android.tools.r8.cf.CfVersion lambda$syntheticSpecify$1(com.android.tools.r8.graph.DexEncodedMethod):342:342 -> e
-    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1403:1404 -> e0
-    1:2:com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo getOptimizationInfo():97 -> e0
-    1:2:boolean isSyntheticMethod():613:614 -> e1
-    1:1:boolean lambda$syntheticSpecify$2(com.android.tools.r8.graph.DexEncodedMethod):345:345 -> f
-    1:2:boolean isVirtualMethod():542:543 -> f1
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():199:199 -> f1
-    3:3:boolean isVirtualMethod():543 -> f1
-    1:1:com.android.tools.r8.graph.DexType getArgumentType(int):201:201 -> g
-    2:2:void lambda$toAbstractMethod$5(com.android.tools.r8.graph.DexEncodedMethod):971:971 -> g
-    1:2:void markNotProcessed():762:763 -> g1
-    1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():97:97 -> getAccessFlags
-    1:1:com.android.tools.r8.graph.DexAnnotationSet getParameterAnnotation(int):916:916 -> h
-    1:2:java.lang.String qualifiedName():869:870 -> h1
-    1:2:void abandonCallSiteOptimizationInfo():1435:1436 -> i0
-    1:2:void removeCode():837:838 -> i1
-    1:1:boolean belongsToDirectPool():618:618 -> j0
+    39:39:void lambda$toForwardingMethod$8(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1241 -> b
+    40:40:void lambda$toForwardingMethod$8(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1237:1237 -> b
+    41:50:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis(com.android.tools.r8.graph.AppView):1277:1286 -> b
+    51:51:void setObsolete():196:196 -> b
+    51:51:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis(com.android.tools.r8.graph.AppView):1287 -> b
+    52:53:void setApiLevelForCode(com.android.tools.r8.utils.AndroidApiLevel):1355:1356 -> b
+    54:54:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1428:1428 -> b
+    1:2:boolean isProcessed():406:407 -> b1
+    1:1:com.android.tools.r8.graph.DexAnnotation lambda$rewriteAllAnnotations$4(java.util.function.BiFunction,com.android.tools.r8.graph.DexAnnotation):850:850 -> c
+    2:4:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1394:1396 -> c
+    5:5:com.android.tools.r8.utils.AndroidApiLevel getApiLevelForCode():1351:1351 -> c
+    5:5:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1398 -> c
+    6:6:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1398:1398 -> c
+    1:2:boolean isPublicMethod():513:514 -> c1
+    1:1:com.android.tools.r8.graph.ParameterAnnotationsList lambda$syntheticSpecify$0(com.android.tools.r8.graph.DexEncodedMethod):283:283 -> d
+    1:2:boolean isPublicized():508:509 -> d1
+    1:1:com.android.tools.r8.cf.CfVersion lambda$syntheticSpecify$1(com.android.tools.r8.graph.DexEncodedMethod):284:284 -> e
+    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1346:1347 -> e0
+    1:2:com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo getOptimizationInfo():98 -> e0
+    1:2:boolean isStatic():541:542 -> e1
+    1:1:boolean lambda$syntheticSpecify$2(com.android.tools.r8.graph.DexEncodedMethod):287:287 -> f
+    1:1:boolean isSynchronized():431:431 -> f1
+    1:1:com.android.tools.r8.graph.DexType getArgumentType(int):205:205 -> g
+    2:2:void lambda$toAbstractMethod$5(com.android.tools.r8.graph.DexEncodedMethod):913:913 -> g
+    1:2:boolean isSyntheticMethod():555:556 -> g1
+    1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():98:98 -> getAccessFlags
+    1:1:com.android.tools.r8.graph.DexAnnotationSet getParameterAnnotation(int):858:858 -> h
+    1:2:boolean isVirtualMethod():484:485 -> h1
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():199:199 -> h1
+    3:3:boolean isVirtualMethod():485 -> h1
+    1:2:void abandonCallSiteOptimizationInfo():1378:1379 -> i0
+    1:2:void markNotProcessed():704:705 -> i1
+    1:1:boolean belongsToDirectPool():560:560 -> j0
     2:2:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():199:199 -> j0
-    2:2:boolean belongsToDirectPool():618 -> j0
-    1:1:com.android.tools.r8.graph.DexType returnType():393:393 -> j1
-    1:1:boolean belongsToVirtualPool():622:622 -> k0
-    1:1:void setObsolete():192:192 -> k1
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():332:332 -> l
-    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():1053:1054 -> l0
-    1:1:boolean shouldNotHaveCode():824:824 -> l1
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder builder():1477:1477 -> m0
-    1:11:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():958:968 -> m1
-    12:18:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():966:972 -> m1
-    1:1:void checkIfObsolete():180:180 -> n0
-    1:1:void unsetObsolete():222:222 -> n1
-    1:2:java.lang.String codeToString():1377:1378 -> o0
-    1:1:void clearGenericSignature():1469:1469 -> p
-    1:2:java.lang.String descriptor():874:875 -> p0
+    2:2:boolean belongsToDirectPool():560 -> j0
+    1:2:java.lang.String qualifiedName():811:812 -> j1
+    1:1:boolean belongsToVirtualPool():564:564 -> k0
+    1:2:void removeCode():779:780 -> k1
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():274:274 -> l
+    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():995:996 -> l0
+    1:1:com.android.tools.r8.graph.DexType returnType():335:335 -> l1
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder builder():1424:1424 -> m0
+    1:1:void setObsolete():196:196 -> m1
+    1:1:void checkIfObsolete():184:184 -> n0
+    1:1:boolean shouldNotHaveCode():766:766 -> n1
+    1:2:java.lang.String codeToString():1320:1321 -> o0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder():1416:1416 -> o1
+    1:1:void clearGenericSignature():1412:1412 -> p
+    1:2:java.lang.String descriptor():816:817 -> p0
+    1:11:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():900:910 -> p1
+    12:12:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():908:908 -> p1
+    13:13:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.unsetCode():1652:1652 -> p1
+    13:13:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():911 -> p1
+    14:17:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():911:914 -> p1
     com.android.tools.r8.utils.structural.StructuralItem self() -> q
-    1:1:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():197:197 -> q0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel getApiLevelForCode():1408:1408 -> r0
-    1:1:void clearAllAnnotations():897:897 -> s
-    2:2:void clearParameterAnnotations():912:912 -> s
-    2:2:void clearAllAnnotations():898 -> s
-    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1440:1441 -> s0
-    1:3:com.android.tools.r8.cf.CfVersion getClassFileVersion():842:844 -> t0
-    1:2:java.lang.String toString():804:805 -> toString
-    1:2:com.android.tools.r8.graph.Code getCode():832:833 -> u0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState getCompilationState():209:209 -> v0
-    1:1:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature getGenericSignature():1459:1459 -> w0
-    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinInfo():627:627 -> x0
-    1:3:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo getMutableOptimizationInfo():1423:1425 -> y0
-    1:1:int getNumberOfArguments():205:205 -> z0
-    2:2:boolean isInstance():594:594 -> z0
-    2:2:int getNumberOfArguments():205 -> z0
-    3:3:int getNumberOfArguments():205:205 -> z0
-com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.graph.h0:
+    1:1:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():201:201 -> q0
+    1:1:void unsetObsolete():230:230 -> q1
+    1:1:com.android.tools.r8.utils.AndroidApiLevel getApiLevelForCode():1351:1351 -> r0
+    1:1:void clearAllAnnotations():839:839 -> s
+    2:2:void clearParameterAnnotations():854:854 -> s
+    2:2:void clearAllAnnotations():840 -> s
+    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1383:1384 -> s0
+    1:3:com.android.tools.r8.cf.CfVersion getClassFileVersion():784:786 -> t0
+    1:2:java.lang.String toString():746:747 -> toString
+    1:2:com.android.tools.r8.graph.Code getCode():774:775 -> u0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState getCompilationState():217:217 -> v0
+    1:1:int getFirstNonReceiverArgumentIndex():209:209 -> w0
+    1:1:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature getGenericSignature():1402:1402 -> x0
+    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinInfo():569:569 -> y0
+    1:3:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo getMutableOptimizationInfo():1366:1368 -> z0
+com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.graph.i0:
     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>():738:738 -> <clinit>
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] com.android.tools.r8.graph.DexEncodedMethod$CompilationState.values():110:110 -> <clinit>
-    2:2:void <clinit>():690 -> <clinit>
-    3:3:void <clinit>():690:690 -> <clinit>
-com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.graph.i0:
+    1:1:void <clinit>():680:680 -> <clinit>
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] com.android.tools.r8.graph.DexEncodedMethod$CompilationState.values():109:109 -> <clinit>
+    2:2:void <clinit>():632 -> <clinit>
+    3:3:void <clinit>():632:632 -> <clinit>
+com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.graph.j0$a:
     com.android.tools.r8.graph.ParameterAnnotationsList parameterAnnotations -> g
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo optimizationInfo -> i
     com.android.tools.r8.graph.GenericSignature$MethodTypeSignature genericSignature -> d
     boolean d8R8Synthesized -> n
-    java.util.function.Consumer buildConsumer -> o
     com.android.tools.r8.kotlin.KotlinMethodLevelInfo kotlinInfo -> j
+    boolean deprecated -> o
     com.android.tools.r8.graph.DexAnnotationSet annotations -> e
     com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride -> f
-    boolean $assertionsDisabled -> p
+    boolean checkMethodNotNull -> p
+    java.util.function.Consumer buildConsumer -> r
     com.android.tools.r8.graph.DexMethod method -> c
+    boolean checkParameterAnnotationList -> q
     com.android.tools.r8.cf.CfVersion classFileVersion -> k
+    boolean $assertionsDisabled -> s
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> h
     com.android.tools.r8.graph.Code code -> b
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> a
     com.android.tools.r8.utils.AndroidApiLevel apiLevelForDefinition -> l
     com.android.tools.r8.utils.AndroidApiLevel apiLevelForCode -> m
-    1:1:void <clinit>():1484:1484 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):1484:1484 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1484:1484 -> <init>
-    3:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean,com.android.tools.r8.graph.DexEncodedMethod$1):1484:1484 -> <init>
-    4:4:void <init>():1504:1504 -> <init>
-    5:17:void <init>():1490:1502 -> <init>
-    18:18:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1507:1507 -> <init>
-    19:19:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1510:1510 -> <init>
-    20:63:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1490:1533 -> <init>
-    64:64:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1529:1529 -> <init>
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder setSimpleInliningConstraint(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):1553:1553 -> a
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder addBuildConsumer(java.util.function.Consumer):1563:1563 -> a
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder setSimpleInliningConstraint(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):1553 -> a
-    3:4:void lambda$setSimpleInliningConstraint$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint,com.android.tools.r8.graph.DexEncodedMethod):1555:1556 -> a
-    5:5:com.android.tools.r8.graph.DexEncodedMethod$Builder addBuildConsumer(java.util.function.Consumer):1563:1563 -> a
-    6:6:com.android.tools.r8.graph.DexEncodedMethod$Builder setAccessFlags(com.android.tools.r8.graph.MethodAccessFlags):1573:1573 -> a
-    7:7:com.android.tools.r8.graph.DexEncodedMethod$Builder setMethod(com.android.tools.r8.graph.DexMethod):1583:1583 -> a
-    8:9:com.android.tools.r8.graph.DexEncodedMethod$Builder setCompilationState(com.android.tools.r8.graph.DexEncodedMethod$CompilationState):1588:1589 -> a
-    10:11:com.android.tools.r8.graph.DexEncodedMethod$Builder setIsLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):1594:1595 -> a
-    12:12:com.android.tools.r8.graph.DexEncodedMethod$Builder setIsLibraryMethodOverrideIf(boolean,com.android.tools.r8.utils.OptionalBool):1602:1602 -> a
-    13:32:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1640:1659 -> a
-    33:33:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1635:1635 -> a
-    33:33:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1659 -> a
-    34:36:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1662:1664 -> a
-    37:37:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1663:1663 -> a
-    38:38:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1635:1635 -> a
-    38:38:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1662 -> a
-    39:42:com.android.tools.r8.graph.DexEncodedMethod$Builder adjustOptimizationInfoAfterRemovingThisParameter(com.android.tools.r8.graph.AppView):1685:1688 -> a
-    43:43:com.android.tools.r8.graph.DexEncodedMethod$Builder setCode(com.android.tools.r8.graph.Code):1694:1694 -> a
-    44:49:com.android.tools.r8.graph.DexEncodedMethod build():1703:1708 -> a
-    50:54:com.android.tools.r8.graph.DexEncodedMethod build():1707:1711 -> a
-    55:55:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):277:277 -> a
-    55:55:com.android.tools.r8.graph.DexEncodedMethod build():1711 -> a
-    56:62:com.android.tools.r8.graph.DexEncodedMethod build():1723:1729 -> a
-    63:63:com.android.tools.r8.graph.DexEncodedMethod$Builder setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1734:1734 -> a
-    64:64:com.android.tools.r8.graph.DexEncodedMethod$Builder setApiLevelForCode(com.android.tools.r8.utils.AndroidApiLevel):1744:1744 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder modifyAccessFlags(java.util.function.Consumer):1568:1568 -> b
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder clearAnnotations():1618:1618 -> b
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder clearAllAnnotations():1626 -> b
-    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):1630:1630 -> b
-    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder clearAnnotations():1618 -> b
-    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder clearAllAnnotations():1626 -> b
-    4:4:com.android.tools.r8.graph.DexEncodedMethod$Builder clearParameterAnnotations():1622:1622 -> b
-    4:4:com.android.tools.r8.graph.DexEncodedMethod$Builder clearAllAnnotations():1626 -> b
-    5:5:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1635:1635 -> b
-    5:5:com.android.tools.r8.graph.DexEncodedMethod$Builder clearParameterAnnotations():1622 -> b
-    5:5:com.android.tools.r8.graph.DexEncodedMethod$Builder clearAllAnnotations():1626 -> b
-    6:6:com.android.tools.r8.graph.DexEncodedMethod$Builder setApiLevelForDefinition(com.android.tools.r8.utils.AndroidApiLevel):1739:1739 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1669:1669 -> c
-    2:2:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():247:247 -> c
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1669 -> c
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder setD8R8Synthesized():1578:1578 -> d
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder setCode(com.android.tools.r8.graph.Code):1694:1694 -> e
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder unsetCode():1699 -> e
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder unsetIsLibraryMethodOverride():1613:1613 -> f
-    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1674:1678 -> g
-com.android.tools.r8.graph.DexEncodedMethod$CompilationState$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.ML0:
+    1:1:void <clinit>():1431:1431 -> <clinit>
+    1:1:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod$1):1431:1431 -> <init>
+    2:2:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1431:1431 -> <init>
+    3:3:void <init>(boolean):1456:1456 -> <init>
+    4:25:void <init>(boolean):1436:1457 -> <init>
+    26:26:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1460:1460 -> <init>
+    27:75:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1436:1484 -> <init>
+    76:76:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1480:1480 -> <init>
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder setSimpleInliningConstraint(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):1504:1504 -> a
+    2:3:void lambda$setSimpleInliningConstraint$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint,com.android.tools.r8.graph.DexEncodedMethod):1506:1507 -> a
+    4:4:com.android.tools.r8.graph.DexEncodedMethod$Builder addBuildConsumer(java.util.function.Consumer):1514:1514 -> a
+    5:5:com.android.tools.r8.graph.DexEncodedMethod$Builder setAccessFlags(com.android.tools.r8.graph.MethodAccessFlags):1524:1524 -> a
+    6:6:com.android.tools.r8.graph.DexEncodedMethod$Builder setMethod(com.android.tools.r8.graph.DexMethod):1529:1529 -> a
+    7:8:com.android.tools.r8.graph.DexEncodedMethod$Builder setCompilationState(com.android.tools.r8.graph.DexEncodedMethod$CompilationState):1534:1535 -> a
+    9:10:com.android.tools.r8.graph.DexEncodedMethod$Builder setIsLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):1540:1541 -> a
+    11:11:com.android.tools.r8.graph.DexEncodedMethod$Builder setIsLibraryMethodOverrideIf(boolean,com.android.tools.r8.utils.OptionalBool):1548:1548 -> a
+    12:12:com.android.tools.r8.graph.DexEncodedMethod$Builder setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):1576:1576 -> a
+    13:13:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1581:1581 -> a
+    14:33:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1586:1605 -> a
+    34:34:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1581:1581 -> a
+    34:34:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1605 -> a
+    35:37:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1608:1610 -> a
+    38:38:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1609:1609 -> a
+    39:39:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1581:1581 -> a
+    39:39:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1608 -> a
+    40:40:com.android.tools.r8.graph.DexEncodedMethod$Builder adjustOptimizationInfoAfterRemovingThisParameter(com.android.tools.r8.graph.AppView):1631:1631 -> a
+    41:41:void lambda$adjustOptimizationInfoAfterRemovingThisParameter$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):1633:1633 -> a
+    42:42:com.android.tools.r8.graph.DexEncodedMethod$Builder modifyOptimizationInfo(java.util.function.BiConsumer):1638:1638 -> a
+    43:44:void lambda$modifyOptimizationInfo$2(java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod):1640:1641 -> a
+    45:45:com.android.tools.r8.graph.DexEncodedMethod$Builder setCode(com.android.tools.r8.graph.Code):1647:1647 -> a
+    46:46:com.android.tools.r8.graph.DexEncodedMethod$Builder setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1656:1656 -> a
+    47:47:com.android.tools.r8.graph.DexEncodedMethod$Builder setApiLevelForCode(com.android.tools.r8.utils.AndroidApiLevel):1666:1666 -> a
+    48:48:com.android.tools.r8.graph.DexEncodedMethod$Builder setDeprecated(boolean):1671:1671 -> a
+    49:49:com.android.tools.r8.graph.DexEncodedMethod$Builder setClassFileVersion(com.android.tools.r8.cf.CfVersion):1676:1676 -> a
+    50:56:com.android.tools.r8.graph.DexEncodedMethod build():1691:1697 -> a
+    57:81:com.android.tools.r8.graph.DexEncodedMethod build():1695:1719 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder modifyAccessFlags(java.util.function.Consumer):1519:1519 -> b
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder clearAnnotations():1564:1564 -> b
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder clearAllAnnotations():1572 -> b
+    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):1576:1576 -> b
+    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder clearAnnotations():1564 -> b
+    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder clearAllAnnotations():1572 -> b
+    4:4:com.android.tools.r8.graph.DexEncodedMethod$Builder clearParameterAnnotations():1568:1568 -> b
+    4:4:com.android.tools.r8.graph.DexEncodedMethod$Builder clearAllAnnotations():1572 -> b
+    5:5:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1581:1581 -> b
+    5:5:com.android.tools.r8.graph.DexEncodedMethod$Builder clearParameterAnnotations():1568 -> b
+    5:5:com.android.tools.r8.graph.DexEncodedMethod$Builder clearAllAnnotations():1572 -> b
+    6:6:com.android.tools.r8.graph.DexEncodedMethod$Builder setApiLevelForDefinition(com.android.tools.r8.utils.AndroidApiLevel):1661:1661 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder disableMethodNotNullCheck():1681:1681 -> c
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder disableParameterAnnotationListCheck():1686:1686 -> d
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1615:1615 -> e
+    2:2:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():247:247 -> e
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1615 -> e
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder unsetIsLibraryMethodOverride():1559:1559 -> f
+    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1620:1624 -> g
+com.android.tools.r8.graph.DexEncodedMethod$CompilationState$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.PL0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
@@ -59927,7 +59942,7 @@ com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.graph.p0:
     1:1:void registerTypeNeededForDesugaring(com.android.tools.r8.graph.DexType):2422:2422 -> h
     2:4:boolean verifyNoCachedTypeElements():2711:2713 -> h
 com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.graph.m0:
-com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers -> com.android.tools.r8.internal.PL0:
+com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers -> com.android.tools.r8.internal.SL0:
     com.android.tools.r8.graph.DexField TYPE -> q
     com.android.tools.r8.graph.DexField SUPPORTED_64_BIT_ABIS -> n
     com.android.tools.r8.graph.DexField SUPPORTED_32_BIT_ABIS -> m
@@ -59947,7 +59962,7 @@ com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers -> com.android.t
     com.android.tools.r8.graph.DexField CPU_ABI -> c
     1:23:void <init>(com.android.tools.r8.graph.DexItemFactory):903:925 -> <init>
     1:17:void forEachFinalField(java.util.function.Consumer):929:945 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers -> com.android.tools.r8.internal.QL0:
+com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers -> com.android.tools.r8.internal.TL0:
     com.android.tools.r8.graph.DexField SECURITY_PATCH -> e
     com.android.tools.r8.graph.DexField RELEASE -> b
     com.android.tools.r8.graph.DexField CODENAME -> a
@@ -59955,21 +59970,21 @@ com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers -> com.an
     com.android.tools.r8.graph.DexField SDK -> c
     1:8:void <init>(com.android.tools.r8.graph.DexItemFactory):949:956 -> <init>
     1:5:void forEachFinalField(java.util.function.Consumer):960:964 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidOsBundleMembers -> com.android.tools.r8.internal.RL0:
+com.android.tools.r8.graph.DexItemFactory$AndroidOsBundleMembers -> com.android.tools.r8.internal.UL0:
     com.android.tools.r8.graph.DexField EMPTY -> b
     com.android.tools.r8.graph.DexField CREATOR -> a
     1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):968:972 -> <init>
     1:2:void forEachFinalField(java.util.function.Consumer):976:977 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidSystemOsConstantsMembers -> com.android.tools.r8.internal.SL0:
+com.android.tools.r8.graph.DexItemFactory$AndroidSystemOsConstantsMembers -> com.android.tools.r8.internal.VL0:
     com.android.tools.r8.graph.DexField S_IXUSR -> b
     com.android.tools.r8.graph.DexField S_IRUSR -> a
     1:4:void <init>(com.android.tools.r8.graph.DexItemFactory):981:984 -> <init>
     1:2:void forEachFinalField(java.util.function.Consumer):988:989 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidUtilSparseArrayMembers -> com.android.tools.r8.internal.TL0:
+com.android.tools.r8.graph.DexItemFactory$AndroidUtilSparseArrayMembers -> com.android.tools.r8.internal.WL0:
     com.android.tools.r8.graph.DexMethod set -> b
     com.android.tools.r8.graph.DexMethod put -> a
     1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1016:1020 -> <init>
-com.android.tools.r8.graph.DexItemFactory$AndroidViewViewMembers -> com.android.tools.r8.internal.UL0:
+com.android.tools.r8.graph.DexItemFactory$AndroidViewViewMembers -> com.android.tools.r8.internal.XL0:
     com.android.tools.r8.graph.DexField SELECTED_STATE_SET -> e
     com.android.tools.r8.graph.DexField EMPTY_STATE_SET -> b
     com.android.tools.r8.graph.DexField TRANSLATION_Z -> a
@@ -60000,7 +60015,7 @@ com.android.tools.r8.graph.DexItemFactory$BooleanMembers -> com.android.tools.r8
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1038:1038 -> <init>
     3:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1025:1036 -> <init>
     1:3:void forEachFinalField(java.util.function.Consumer):1042:1044 -> a
-com.android.tools.r8.graph.DexItemFactory$BufferMembers -> com.android.tools.r8.internal.VL0:
+com.android.tools.r8.graph.DexItemFactory$BufferMembers -> com.android.tools.r8.internal.YL0:
     java.util.List bufferCovariantMethods -> a
     1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1388:1399 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ByteMembers -> com.android.tools.r8.graph.q0:
@@ -60066,18 +60081,18 @@ com.android.tools.r8.graph.DexItemFactory$EnumMembers -> com.android.tools.r8.gr
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1609:1609 -> <init>
     3:48:void <init>(com.android.tools.r8.graph.DexItemFactory):1591:1636 -> <init>
     1:1:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1649:1649 -> a
-    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> a
+    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> a
     2:2:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1649 -> a
     3:4:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1649:1650 -> a
-    5:5:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():237:237 -> a
+    5:5:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():203:203 -> a
     5:5:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1650 -> a
     1:1:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1654:1654 -> b
-    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> b
+    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> b
     2:2:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1654 -> b
     3:5:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1654:1656 -> b
-    6:6:boolean com.android.tools.r8.graph.DexEncodedField.isSynthetic():263:263 -> b
+    6:6:boolean com.android.tools.r8.graph.DexEncodedField.isSynthetic():229:229 -> b
     6:6:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1657 -> b
-    7:7:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():237:237 -> b
+    7:7:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():203:203 -> b
     7:7:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1658 -> b
 com.android.tools.r8.graph.DexItemFactory$FloatMembers -> com.android.tools.r8.graph.w0:
     com.android.tools.r8.graph.DexField TYPE -> a
@@ -60086,16 +60101,16 @@ com.android.tools.r8.graph.DexItemFactory$FloatMembers -> com.android.tools.r8.g
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1075:1075 -> <init>
     3:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1070:1073 -> <init>
     1:1:void forEachFinalField(java.util.function.Consumer):1079:1079 -> a
-com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods -> com.android.tools.r8.internal.WL0:
+com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods -> com.android.tools.r8.internal.ZL0:
     com.android.tools.r8.graph.DexMethod initWithMessage -> a
     1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1670:1674 -> <init>
     6:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1673:1673 -> <init>
-com.android.tools.r8.graph.DexItemFactory$IntegerMembers -> com.android.tools.r8.internal.XL0:
+com.android.tools.r8.graph.DexItemFactory$IntegerMembers -> com.android.tools.r8.internal.aM0:
     com.android.tools.r8.graph.DexField TYPE -> a
     com.android.tools.r8.graph.DexMethod toString -> b
     1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1262:1267 -> <init>
     1:1:void forEachFinalField(java.util.function.Consumer):1271:1271 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaIoFileMembers -> com.android.tools.r8.internal.YL0:
+com.android.tools.r8.graph.DexItemFactory$JavaIoFileMembers -> com.android.tools.r8.internal.bM0:
     com.android.tools.r8.graph.DexField separator -> b
     com.android.tools.r8.graph.DexField pathSeparator -> a
     1:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1083:1086 -> <init>
@@ -60118,12 +60133,12 @@ com.android.tools.r8.graph.DexItemFactory$JavaLangSystemMethods -> com.android.t
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1586:1586 -> <init>
     3:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1578:1581 -> <init>
     7:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1579:1584 -> <init>
-com.android.tools.r8.graph.DexItemFactory$JavaMathBigIntegerMembers -> com.android.tools.r8.internal.ZL0:
+com.android.tools.r8.graph.DexItemFactory$JavaMathBigIntegerMembers -> com.android.tools.r8.internal.cM0:
     com.android.tools.r8.graph.DexField ZERO -> b
     com.android.tools.r8.graph.DexField ONE -> a
     1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1095:1099 -> <init>
     1:2:void forEachFinalField(java.util.function.Consumer):1103:1104 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaNioByteOrderMembers -> com.android.tools.r8.internal.aM0:
+com.android.tools.r8.graph.DexItemFactory$JavaNioByteOrderMembers -> com.android.tools.r8.internal.dM0:
     com.android.tools.r8.graph.DexField BIG_ENDIAN -> b
     com.android.tools.r8.graph.DexField LITTLE_ENDIAN -> a
     1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1108:1113 -> <init>
@@ -60134,12 +60149,12 @@ com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.t
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1122:1122 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1127:1131 -> <init>
     7:13:void <init>(com.android.tools.r8.graph.DexItemFactory):1129:1135 -> <init>
-com.android.tools.r8.graph.DexItemFactory$JavaUtilComparatorMembers -> com.android.tools.r8.internal.bM0:
+com.android.tools.r8.graph.DexItemFactory$JavaUtilComparatorMembers -> com.android.tools.r8.internal.eM0:
     com.android.tools.r8.graph.DexField EMPTY_SET -> b
     com.android.tools.r8.graph.DexField EMPTY_LIST -> a
     1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1143:1148 -> <init>
     1:2:void forEachFinalField(java.util.function.Consumer):1152:1153 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers -> com.android.tools.r8.internal.cM0:
+com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers -> com.android.tools.r8.internal.fM0:
     com.android.tools.r8.graph.DexField NANOSECONDS -> f
     com.android.tools.r8.graph.DexField MINUTES -> e
     com.android.tools.r8.graph.DexField SECONDS -> g
@@ -60149,13 +60164,13 @@ com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers -> c
     com.android.tools.r8.graph.DexField MICROSECONDS -> c
     1:16:void <init>(com.android.tools.r8.graph.DexItemFactory):1157:1172 -> <init>
     1:7:void forEachFinalField(java.util.function.Consumer):1176:1182 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilLocaleMembers -> com.android.tools.r8.internal.dM0:
+com.android.tools.r8.graph.DexItemFactory$JavaUtilLocaleMembers -> com.android.tools.r8.internal.gM0:
     com.android.tools.r8.graph.DexField ROOT -> b
     com.android.tools.r8.graph.DexField ENGLISH -> a
     com.android.tools.r8.graph.DexField US -> c
     1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1186:1190 -> <init>
     1:3:void forEachFinalField(java.util.function.Consumer):1194:1196 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers -> com.android.tools.r8.internal.eM0:
+com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers -> com.android.tools.r8.internal.hM0:
     com.android.tools.r8.graph.DexField WARNING -> f
     com.android.tools.r8.graph.DexField SEVERE -> e
     com.android.tools.r8.graph.DexField FINE -> b
@@ -60164,7 +60179,7 @@ com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers -> com.and
     com.android.tools.r8.graph.DexField FINER -> c
     1:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1200:1213 -> <init>
     1:6:void forEachFinalField(java.util.function.Consumer):1217:1222 -> a
-com.android.tools.r8.graph.DexItemFactory$LibraryMembers -> com.android.tools.r8.internal.fM0:
+com.android.tools.r8.graph.DexItemFactory$LibraryMembers -> com.android.tools.r8.internal.iM0:
     1:1:void <init>():898:898 -> <init>
     void forEachFinalField(java.util.function.Consumer) -> a
 com.android.tools.r8.graph.DexItemFactory$LongMembers -> com.android.tools.r8.graph.B0:
@@ -60175,7 +60190,7 @@ com.android.tools.r8.graph.DexItemFactory$LongMembers -> com.android.tools.r8.gr
     3:11:void <init>(com.android.tools.r8.graph.DexItemFactory):1228:1236 -> <init>
     12:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1235:1235 -> <init>
     1:1:void forEachFinalField(java.util.function.Consumer):1241:1241 -> a
-com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.internal.gM0:
+com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.internal.jM0:
     com.android.tools.r8.graph.DexMethod initWithMessage -> b
     com.android.tools.r8.graph.DexMethod init -> a
     1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1662:1667 -> <init>
@@ -60192,7 +60207,7 @@ com.android.tools.r8.graph.DexItemFactory$ObjectMembers -> com.android.tools.r8.
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1350:1350 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1374:1374 -> <init>
     3:30:void <init>(com.android.tools.r8.graph.DexItemFactory):1356:1383 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ObjectMethodsMembers -> com.android.tools.r8.internal.hM0:
+com.android.tools.r8.graph.DexItemFactory$ObjectMethodsMembers -> com.android.tools.r8.internal.kM0:
     com.android.tools.r8.graph.DexMethod bootstrap -> a
     1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1335:1346 -> <init>
     13:13:void <init>(com.android.tools.r8.graph.DexItemFactory):1339:1339 -> <init>
@@ -60217,7 +60232,7 @@ com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8
     40:47:void <init>(com.android.tools.r8.graph.DexItemFactory):1433:1440 -> <init>
     48:48:void <init>(com.android.tools.r8.graph.DexItemFactory):1438:1438 -> <init>
     1:1:boolean isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1445:1445 -> a
-com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.internal.iM0:
+com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.internal.lM0:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
     com.android.tools.r8.graph.DexItemFactory this$0 -> g
@@ -60238,7 +60253,7 @@ com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.g
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):2058:2058 -> <init>
     2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):2062:2067 -> <init>
     8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):2064:2064 -> <init>
-com.android.tools.r8.graph.DexItemFactory$RecordMembers -> com.android.tools.r8.internal.jM0:
+com.android.tools.r8.graph.DexItemFactory$RecordMembers -> com.android.tools.r8.internal.mM0:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod hashCode -> c
     com.android.tools.r8.graph.DexMethod equals -> b
@@ -60285,7 +60300,7 @@ com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.t
     2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1930:1930 -> a
     3:29:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.graph.DexMethod,java.util.List):1951:1977 -> a
     1:1:boolean isAppendPrimitiveMethod(com.android.tools.r8.graph.DexMethod):1938:1938 -> b
-com.android.tools.r8.graph.DexItemFactory$StringConcatFactoryMembers -> com.android.tools.r8.internal.kM0:
+com.android.tools.r8.graph.DexItemFactory$StringConcatFactoryMembers -> com.android.tools.r8.internal.nM0:
     com.android.tools.r8.graph.DexMethod makeConcatWithConstants -> b
     com.android.tools.r8.graph.DexMethod makeConcat -> a
     1:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1275:1281 -> <init>
@@ -60345,7 +60360,7 @@ com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.graph.I0:
     1:1:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):115:115 -> b
     1:3:boolean verifyLibraryMethod(com.android.tools.r8.graph.DexEncodedMethod):82:84 -> c
     1:1:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):89:89 -> f
-    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> f
+    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> f
     2:2:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):90 -> f
     3:3:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):90:90 -> f
     com.android.tools.r8.graph.ClasspathOrLibraryClass asClasspathOrLibraryClass() -> t
@@ -60375,11 +60390,11 @@ com.android.tools.r8.graph.DexMemberAnnotation -> com.android.tools.r8.graph.K0:
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):21:21 -> a
     1:3:boolean equals(java.lang.Object):34:36 -> equals
     1:1:int hashCode():26:26 -> hashCode
-com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> com.android.tools.r8.internal.lM0:
+com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> com.android.tools.r8.internal.oM0:
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexAnnotationSet):44:44 -> <init>
-com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation -> com.android.tools.r8.internal.mM0:
+com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation -> com.android.tools.r8.internal.pM0:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexAnnotationSet):56:56 -> <init>
-com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> com.android.tools.r8.internal.nM0:
+com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> com.android.tools.r8.internal.qM0:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ParameterAnnotationsList):69:69 -> <init>
 com.android.tools.r8.graph.DexMethod -> com.android.tools.r8.graph.L0:
     com.android.tools.r8.graph.DexProto proto -> i
@@ -60636,7 +60651,7 @@ com.android.tools.r8.graph.DexProgramClass -> com.android.tools.r8.graph.S0:
     boolean isNotProgramClass() -> V0
     1:3:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):18:20 -> a
     1:3:void lambda$collectIndexedItems$24(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):397 -> a
-    4:4:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> a
+    4:4:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> a
     4:4:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):21 -> a
     4:4:void lambda$collectIndexedItems$24(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):397 -> a
     5:6:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):21:22 -> a
@@ -60662,7 +60677,7 @@ com.android.tools.r8.graph.DexProgramClass -> com.android.tools.r8.graph.S0:
     61:69:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):390:398 -> a
     70:74:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):404:408 -> a
     75:75:void lambda$addDependencies$26(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):420:420 -> a
-    76:76:void com.android.tools.r8.graph.DexEncodedMethod.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):810:810 -> a
+    76:76:void com.android.tools.r8.graph.DexEncodedMethod.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):752:752 -> a
     76:76:void lambda$addDependencies$26(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):420 -> a
     77:77:com.android.tools.r8.graph.DexProgramClass asProgramClassOrNull(com.android.tools.r8.graph.DexClass):471:471 -> a
     78:80:void setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):485:487 -> a
@@ -61043,7 +61058,7 @@ com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.graph.Y0:
     com.android.tools.r8.utils.structural.StructuralItem self() -> q
     1:1:int size():137:137 -> size
     1:8:java.lang.String toString():146:153 -> toString
-com.android.tools.r8.graph.DexTypeUtils -> com.android.tools.r8.internal.vM0:
+com.android.tools.r8.graph.DexTypeUtils -> com.android.tools.r8.internal.yM0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:8:com.android.tools.r8.graph.DexType computeLeastUpperBound(com.android.tools.r8.graph.AppView,java.lang.Iterable):16:23 -> a
@@ -61660,7 +61675,7 @@ com.android.tools.r8.graph.DirectMappedDexApplication$Builder -> com.android.too
     1:7:void commitPendingClasspathClasses():259:265 -> g
     1:7:java.util.List getClasspathClasses():270 -> g
     8:8:java.util.List getClasspathClasses():271:271 -> g
-com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.internal.lN0:
+com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.internal.oN0:
     int $r8$clinit -> d
     com.android.tools.r8.graph.DexType enclosingClass -> a
     com.android.tools.r8.graph.DexMethod enclosingMethod -> b
@@ -61716,9 +61731,9 @@ com.android.tools.r8.graph.FieldAccessFlags$Builder -> com.android.tools.r8.grap
     1:1:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setSynthetic():360:360 -> e
     1:1:com.android.tools.r8.graph.AccessFlags$BuilderBase setSynthetic():0 -> e
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.internal.EO0:
-com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.internal.FO0:
-com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.internal.GO0:
+com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.internal.HO0:
+com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.internal.IO0:
+com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.internal.JO0:
     java.util.Map infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():15:15 -> <clinit>
@@ -61747,7 +61762,7 @@ com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8
     2:2:com.android.tools.r8.graph.FieldAccessInfo get(com.android.tools.r8.graph.DexField):15 -> b
     1:1:com.android.tools.r8.graph.FieldAccessInfoImpl get(com.android.tools.r8.graph.DexField):50:50 -> c
     2:2:boolean verifyMappingIsOneToOne():95:95 -> c
-com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.internal.HO0:
+com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.internal.KO0:
     com.android.tools.r8.graph.AbstractAccessContexts readsWithContexts -> c
     com.android.tools.r8.graph.DexField field -> a
     com.android.tools.r8.graph.FieldAccessInfoImpl MISSING_FIELD_ACCESS_INFO -> e
@@ -61814,7 +61829,7 @@ com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.internal.
     1:1:void setReadFromAnnotation():201:201 -> p
     1:1:void setReadFromMethodHandle():210:210 -> q
     1:1:void setWrittenFromMethodHandle():225:225 -> r
-com.android.tools.r8.graph.FieldResolutionResult -> com.android.tools.r8.internal.cP0:
+com.android.tools.r8.graph.FieldResolutionResult -> com.android.tools.r8.internal.fP0:
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.graph.DexClass getInitialResolutionHolder() -> a
     1:1:com.android.tools.r8.graph.DexClassAndMember com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult.getResolutionPair():73:73 -> c
@@ -61875,7 +61890,7 @@ com.android.tools.r8.graph.FieldResolutionResult$UnknownFieldResolutionResult ->
     com.android.tools.r8.graph.SuccessfulMemberResolutionResult asSuccessfulMemberResolutionResult() -> g
     boolean isFailedOrUnknownResolution() -> q
     1:1:com.android.tools.r8.graph.FieldResolutionResult$UnknownFieldResolutionResult access$100():177:177 -> s
-com.android.tools.r8.graph.FinalInitClassLens -> com.android.tools.r8.internal.nP0:
+com.android.tools.r8.graph.FinalInitClassLens -> com.android.tools.r8.internal.qP0:
     java.util.Map mapping -> a
     1:2:void <init>(java.util.Map):14:15 -> <init>
     1:1:com.android.tools.r8.graph.InitClassLens$Builder com.android.tools.r8.graph.InitClassLens.builder():13:13 -> a
@@ -62151,7 +62166,7 @@ com.android.tools.r8.graph.GenericSignatureContextBuilder -> com.android.tools.r
     82:82:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.ProgramMethod):158:158 -> a
     83:84:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate):203:204 -> a
     85:89:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):213:217 -> a
-    90:90:boolean com.android.tools.r8.graph.AppView.hasLiveness():611:611 -> a
+    90:90:boolean com.android.tools.r8.graph.AppView.hasLiveness():616:616 -> a
     90:90:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):222 -> a
     91:99:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):223:231 -> a
     100:100:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():258:258 -> a
@@ -62230,7 +62245,7 @@ com.android.tools.r8.graph.GenericSignatureCorrectnessHelper -> com.android.tool
     1:1:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper createForInitialCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GenericSignatureContextBuilder):101:101 -> a
     2:8:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult run(java.util.List):110:116 -> a
     9:26:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):122:139 -> a
-    27:27:boolean com.android.tools.r8.graph.AppView.hasLiveness():611:611 -> a
+    27:27:boolean com.android.tools.r8.graph.AppView.hasLiveness():616:616 -> a
     27:27:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):139 -> a
     28:37:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):139:148 -> a
     38:38:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():760:760 -> a
@@ -62244,7 +62259,7 @@ com.android.tools.r8.graph.GenericSignatureCorrectnessHelper -> com.android.tool
     77:77:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):185:185 -> a
     78:78:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult lambda$evaluateSignaturesForClass$0(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):160:160 -> a
     79:80:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):165:166 -> a
-    81:81:boolean com.android.tools.r8.graph.AppView.hasLiveness():611:611 -> a
+    81:81:boolean com.android.tools.r8.graph.AppView.hasLiveness():616:616 -> a
     81:81:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):166 -> a
     82:92:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):166:176 -> a
     93:93:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():760:760 -> a
@@ -62253,7 +62268,7 @@ com.android.tools.r8.graph.GenericSignatureCorrectnessHelper -> com.android.tool
     95:102:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):173:180 -> a
     103:103:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult lambda$evaluateSignaturesForClass$2(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):189:189 -> a
     104:107:void lambda$evaluateSignaturesForClass$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):192:195 -> a
-    108:108:boolean com.android.tools.r8.graph.AppView.hasLiveness():611:611 -> a
+    108:108:boolean com.android.tools.r8.graph.AppView.hasLiveness():616:616 -> a
     108:108:void lambda$evaluateSignaturesForClass$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):195 -> a
     109:118:void lambda$evaluateSignaturesForClass$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):195:204 -> a
     119:119:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():760:760 -> a
@@ -62374,7 +62389,7 @@ com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureCon
     157:157:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):427 -> a
     158:161:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):427:430 -> a
     1:8:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArguments(java.util.List,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):325:332 -> b
-com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.PQ0:
+com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.SQ0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode.clearIfInvalid() -> a
@@ -62742,7 +62757,7 @@ com.android.tools.r8.graph.GraphLens -> com.android.tools.r8.graph.b2:
     57:57:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$rewriteCallSites$1(com.android.tools.r8.graph.DexCallSite):535:535 -> a
     58:76:java.util.Map rewriteReferenceKeys(java.util.Map,java.util.function.Function):559:577 -> a
     77:82:void lambda$rewriteReferenceKeys$3(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexReference,java.lang.Object):563:568 -> a
-    83:85:java.util.ArrayList com.android.tools.r8.utils.ListUtils.newArrayList(java.lang.Object,java.lang.Object):169:171 -> a
+    83:85:java.util.ArrayList com.android.tools.r8.utils.ListUtils.newArrayList(java.lang.Object,java.lang.Object):177:179 -> a
     83:85:void lambda$rewriteReferenceKeys$3(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexReference,java.lang.Object):572 -> a
     86:87:void lambda$rewriteReferenceKeys$3(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexReference,java.lang.Object):572:573 -> a
     88:90:void lambda$rewriteReferenceKeys$4(java.util.function.Function,java.util.Map,com.android.tools.r8.graph.DexReference,java.util.List):579:581 -> a
@@ -62782,7 +62797,7 @@ com.android.tools.r8.graph.GraphLens -> com.android.tools.r8.graph.b2:
     boolean isIdentityLens() -> g
     boolean isNonIdentityLens() -> h
 com.android.tools.r8.graph.GraphLens$1 -> com.android.tools.r8.graph.P1:
-com.android.tools.r8.graph.GraphLens$Builder -> com.android.tools.r8.internal.WQ0:
+com.android.tools.r8.graph.GraphLens$Builder -> com.android.tools.r8.internal.ZQ0:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap methodMap -> b
     java.util.Map typeMap -> c
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap fieldMap -> a
@@ -62963,7 +62978,7 @@ com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens -> com.android.tools.r
     boolean isNonIdentityLens() -> h
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():703:703 -> i
     1:1:com.android.tools.r8.graph.GraphLens getPrevious():707:707 -> j
-com.android.tools.r8.graph.ImmediateProgramSubtypingInfo -> com.android.tools.r8.internal.oS0:
+com.android.tools.r8.graph.ImmediateProgramSubtypingInfo -> com.android.tools.r8.internal.rS0:
     java.util.Map immediateSubtypes -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):28:30 -> <init>
@@ -62983,20 +62998,20 @@ com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.graph.c2:
     1:1:void <init>():9:9 -> <init>
     int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping) -> a
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):14:14 -> a
-com.android.tools.r8.graph.InitClassLens -> com.android.tools.r8.internal.xT0:
+com.android.tools.r8.graph.InitClassLens -> com.android.tools.r8.internal.AT0:
     1:1:void <init>():10:10 -> <init>
     com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.InitClassLens rewrittenWithLens(com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.graph.InitClassLens$Builder builder():13:13 -> a
     1:1:com.android.tools.r8.graph.ThrowingInitClassLens getThrowingInstance():17:17 -> b
-com.android.tools.r8.graph.InitClassLens$Builder -> com.android.tools.r8.internal.wT0:
+com.android.tools.r8.graph.InitClassLens$Builder -> com.android.tools.r8.internal.zT0:
     java.util.Map mapping -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():28:28 -> <clinit>
     1:3:void <init>():28:30 -> <init>
     1:2:void map(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):33:34 -> a
     3:3:com.android.tools.r8.graph.FinalInitClassLens build():38:38 -> a
-com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.internal.QT0:
+com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.internal.TT0:
     com.android.tools.r8.graph.DexString innerName -> d
     boolean $assertionsDisabled -> e
     int $r8$clinit -> f
@@ -63020,7 +63035,7 @@ com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.internal.
     1:1:boolean isAnonymous():62:62 -> e
     1:1:boolean isNamed():58:58 -> f
     1:4:java.lang.String toString():124:127 -> toString
-com.android.tools.r8.graph.InstantiatedSubTypeInfo -> com.android.tools.r8.internal.pU0:
+com.android.tools.r8.graph.InstantiatedSubTypeInfo -> com.android.tools.r8.internal.sU0:
     void forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer) -> a
 com.android.tools.r8.graph.InvalidCode -> com.android.tools.r8.graph.d2:
     com.android.tools.r8.graph.InvalidCode INSTANCE -> c
@@ -63037,7 +63052,7 @@ com.android.tools.r8.graph.InvalidCode -> com.android.tools.r8.graph.d2:
     5:5:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):47:47 -> a
     boolean computeEquals(java.lang.Object) -> g
     1:1:java.lang.String toString():42:42 -> toString
-com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.internal.FY0:
+com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.internal.IY0:
     java.util.concurrent.ConcurrentHashMap stringCache -> d
     com.android.tools.r8.utils.InternalOptions options -> a
     java.util.concurrent.ConcurrentHashMap asmTypeCache -> c
@@ -63136,25 +63151,25 @@ com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.and
     com.android.tools.r8.graph.JarApplicationReader application -> b
     boolean $assertionsDisabled -> f
     java.util.function.BiConsumer onVisitEnd -> c
-    1:1:void <clinit>():961:961 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):970:970 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):965:972 -> <init>
-    1:2:void visitEnum(java.lang.String,java.lang.String,java.lang.String):982:983 -> a
-    3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):988:988 -> a
-    4:6:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):989:989 -> a
-    7:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):995:995 -> a
-    8:9:void lambda$visitArray$1(java.lang.String,java.util.List,java.util.List):996:997 -> a
-    10:10:void visitEnd():1003:1003 -> a
-    11:16:void addElement(java.lang.String,com.android.tools.r8.graph.DexValue):1008:1013 -> a
-    17:38:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1079:1100 -> a
-    17:38:void visit(java.lang.String,java.lang.Object):977 -> a
-    39:94:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):1017:1072 -> a
-    39:94:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1102 -> a
-    39:94:void visit(java.lang.String,java.lang.Object):977 -> a
-    95:95:void visit(java.lang.String,java.lang.Object):977:977 -> a
-    96:96:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):1074:1074 -> a
-    96:96:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1102 -> a
-    96:96:void visit(java.lang.String,java.lang.Object):977 -> a
+    1:1:void <clinit>():963:963 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):972:972 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):967:974 -> <init>
+    1:2:void visitEnum(java.lang.String,java.lang.String,java.lang.String):984:985 -> a
+    3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):990:990 -> a
+    4:6:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):991:991 -> a
+    7:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):997:997 -> a
+    8:9:void lambda$visitArray$1(java.lang.String,java.util.List,java.util.List):998:999 -> a
+    10:10:void visitEnd():1005:1005 -> a
+    11:16:void addElement(java.lang.String,com.android.tools.r8.graph.DexValue):1010:1015 -> a
+    17:38:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1081:1102 -> a
+    17:38:void visit(java.lang.String,java.lang.Object):979 -> a
+    39:94:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):1019:1074 -> a
+    39:94:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1104 -> a
+    39:94:void visit(java.lang.String,java.lang.Object):979 -> a
+    95:95:void visit(java.lang.String,java.lang.Object):979:979 -> a
+    96:96:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):1076:1076 -> a
+    96:96:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1104 -> a
+    96:96:void visit(java.lang.String,java.lang.Object):979 -> a
 com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.graph.f2:
     com.android.tools.r8.graph.ClassKind classKind -> d
     com.android.tools.r8.graph.DexType superType -> l
@@ -63351,19 +63366,19 @@ com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.
     25:31:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):640:646 -> <init>
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
     1:7:void visitEnd():663:669 -> a
-    8:8:com.android.tools.r8.graph.DexValue getStaticValue(java.lang.Object,com.android.tools.r8.graph.DexType):694:694 -> a
+    8:8:com.android.tools.r8.graph.DexValue getStaticValue(java.lang.Object,com.android.tools.r8.graph.DexType):695:695 -> a
     8:8:void visitEnd():669 -> a
     9:9:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():43:43 -> a
-    9:9:com.android.tools.r8.graph.DexValue getStaticValue(java.lang.Object,com.android.tools.r8.graph.DexType):694 -> a
+    9:9:com.android.tools.r8.graph.DexValue getStaticValue(java.lang.Object,com.android.tools.r8.graph.DexType):695 -> a
     9:9:void visitEnd():669 -> a
-    10:39:com.android.tools.r8.graph.DexValue getStaticValue(java.lang.Object,com.android.tools.r8.graph.DexType):695:724 -> a
+    10:39:com.android.tools.r8.graph.DexValue getStaticValue(java.lang.Object,com.android.tools.r8.graph.DexType):696:725 -> a
     10:39:void visitEnd():669 -> a
-    40:47:void visitEnd():670:677 -> a
-    48:48:void com.android.tools.r8.graph.DexEncodedField.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue,boolean):79:79 -> a
-    48:48:void visitEnd():677 -> a
-    49:57:void visitEnd():678:686 -> a
-    58:58:void visitEnd():684:684 -> a
-    59:62:java.util.List getAnnotations():728:731 -> a
+    40:40:void visitEnd():671:671 -> a
+    41:41:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField.builder():344:344 -> a
+    41:41:void visitEnd():671 -> a
+    42:57:void visitEnd():672:687 -> a
+    58:58:void visitEnd():685:685 -> a
+    59:62:java.util.List getAnnotations():729:732 -> a
     59:62:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):651 -> a
     63:63:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):651:651 -> a
 com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.graph.h2:
@@ -63382,63 +63397,63 @@ com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android
     com.android.tools.r8.graph.DexMethod method -> t
     java.util.List annotations -> m
     com.android.tools.r8.graph.Code code -> w
-    1:1:void <clinit>():735:735 -> <clinit>
-    1:1:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):759:759 -> <init>
-    2:34:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):740:772 -> <init>
-    35:45:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):771:781 -> <init>
-    46:52:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):776:782 -> <init>
+    1:1:void <clinit>():736:736 -> <clinit>
+    1:1:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):760:760 -> <init>
+    2:34:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):741:773 -> <init>
+    35:45:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):772:782 -> <init>
+    46:52:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):777:783 -> <init>
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean) -> a
-    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):787:787 -> a
-    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():792:792 -> a
-    3:4:void lambda$visitAnnotationDefault$0(java.util.List,java.util.List):793:794 -> a
-    5:11:void visitAnnotableParameterCount(int,boolean):807:813 -> a
-    12:23:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):818:829 -> a
-    24:24:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):828:828 -> a
-    25:25:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):957:957 -> a
+    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):788:788 -> a
+    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():793:793 -> a
+    3:4:void lambda$visitAnnotationDefault$0(java.util.List,java.util.List):794:795 -> a
+    5:11:void visitAnnotableParameterCount(int,boolean):808:814 -> a
+    12:23:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):819:830 -> a
+    24:24:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):829:829 -> a
+    25:25:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):959:959 -> a
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> b
-    1:6:void visitParameter(java.lang.String,int):855:860 -> b
+    1:6:void visitParameter(java.lang.String,int):856:861 -> b
     7:7:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():43:43 -> b
-    7:7:void visitParameter(java.lang.String,int):860 -> b
-    8:10:void visitParameter(java.lang.String,int):860:862 -> b
-    11:11:void visitCode():867:867 -> b
+    7:7:void visitParameter(java.lang.String,int):861 -> b
+    8:10:void visitParameter(java.lang.String,int):861:863 -> b
+    11:11:void visitCode():868:868 -> b
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> c
-    1:2:void visitEnd():879:880 -> c
-    3:4:boolean classRequiresCode():871:872 -> c
-    3:4:void visitEnd():880 -> c
+    1:2:void visitEnd():880:881 -> c
+    3:4:boolean classRequiresCode():872:873 -> c
+    3:4:void visitEnd():881 -> c
     5:5:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1719:1719 -> c
-    5:5:boolean classRequiresCode():872 -> c
-    5:5:void visitEnd():880 -> c
-    6:8:boolean classRequiresCode():872:874 -> c
-    6:8:void visitEnd():880 -> c
-    9:17:void visitEnd():881:889 -> c
+    5:5:boolean classRequiresCode():873 -> c
+    5:5:void visitEnd():881 -> c
+    6:8:boolean classRequiresCode():873:875 -> c
+    6:8:void visitEnd():881 -> c
+    9:17:void visitEnd():882:890 -> c
     18:18:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.ParameterAnnotationsList.create(com.android.tools.r8.graph.DexAnnotationSet[]):72:72 -> c
-    18:18:void visitEnd():891 -> c
-    19:23:void visitEnd():893:897 -> c
-    24:30:void visitEnd():896:902 -> c
+    18:18:void visitEnd():892 -> c
+    19:23:void visitEnd():894:898 -> c
+    24:30:void visitEnd():897:903 -> c
     31:31:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():43:43 -> c
-    31:31:void visitEnd():902 -> c
-    32:52:void visitEnd():899:919 -> c
-    53:53:boolean isReachabilitySensitive():940:940 -> c
-    53:53:void visitEnd():919 -> c
-    54:54:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():43:43 -> c
-    54:54:boolean isReachabilitySensitive():940 -> c
-    54:54:void visitEnd():919 -> c
-    55:57:boolean isReachabilitySensitive():940:942 -> c
-    55:57:void visitEnd():919 -> c
-    58:59:void visitEnd():919:920 -> c
-    60:60:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():199:199 -> c
-    60:60:void visitEnd():920 -> c
-    61:64:void visitEnd():920:923 -> c
-    65:75:void visitEnd():921:931 -> c
-    76:76:void visitEnd():928:928 -> c
-    77:85:void visitEnd():926:934 -> c
-    1:4:java.util.List getAnnotations():950:953 -> d
-com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.internal.GY0:
+    31:31:void visitEnd():903 -> c
+    32:53:void visitEnd():900:921 -> c
+    54:54:boolean isReachabilitySensitive():942:942 -> c
+    54:54:void visitEnd():921 -> c
+    55:55:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():43:43 -> c
+    55:55:boolean isReachabilitySensitive():942 -> c
+    55:55:void visitEnd():921 -> c
+    56:58:boolean isReachabilitySensitive():942:944 -> c
+    56:58:void visitEnd():921 -> c
+    59:60:void visitEnd():921:922 -> c
+    61:61:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():199:199 -> c
+    61:61:void visitEnd():922 -> c
+    62:65:void visitEnd():922:925 -> c
+    66:76:void visitEnd():923:933 -> c
+    77:77:void visitEnd():930:930 -> c
+    78:86:void visitEnd():928:936 -> c
+    1:4:java.util.List getAnnotations():952:955 -> d
+com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.internal.JY0:
     com.android.tools.r8.graph.DexClass owner -> b
     byte[] classCache -> a
     java.util.List codeList -> c
-    1:8:void <init>():1106:1113 -> <init>
+    1:8:void <init>():1108:1115 -> <init>
 com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.graph.o2:
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> f
     com.android.tools.r8.origin.Origin origin -> c
@@ -63497,7 +63512,7 @@ com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.g
     com.android.tools.r8.graph.DexClass clazz -> c
     1:7:void <init>(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,com.android.tools.r8.graph.JarApplicationReader,boolean,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):308:314 -> <init>
     1:11:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):320:330 -> a
-com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions -> com.android.tools.r8.internal.p41:
+com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions -> com.android.tools.r8.internal.s41:
     boolean lineInfo -> a
     boolean localInfo -> b
     int asmReaderOptions -> c
@@ -63967,7 +63982,7 @@ com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> com.android.tools
     2:4:void addProgramClassPotentiallyOverridingNonProgramClass(com.android.tools.r8.graph.DexProgramClass):226:228 -> b
     com.android.tools.r8.graph.DexApplication$Builder self() -> e
     1:5:com.android.tools.r8.graph.LazyLoadedDexApplication build():233:237 -> f
-com.android.tools.r8.graph.LibraryDefinition -> com.android.tools.r8.internal.z41:
+com.android.tools.r8.graph.LibraryDefinition -> com.android.tools.r8.internal.C41:
     1:1:com.android.tools.r8.graph.ProgramDerivedContext asProgramDerivedContext(com.android.tools.r8.graph.ProgramDerivedContext):21:21 -> a
 com.android.tools.r8.graph.LibraryField -> com.android.tools.r8.graph.s2:
     boolean $assertionsDisabled -> e
@@ -63979,7 +63994,7 @@ com.android.tools.r8.graph.LibraryField -> com.android.tools.r8.graph.s2:
     3:3:com.android.tools.r8.graph.DexLibraryClass getHolder():17 -> a
     4:5:com.android.tools.r8.graph.DexLibraryClass getHolder():17:18 -> a
     com.android.tools.r8.graph.LibraryField asLibraryField() -> j
-com.android.tools.r8.graph.LibraryMember -> com.android.tools.r8.internal.B41:
+com.android.tools.r8.graph.LibraryMember -> com.android.tools.r8.internal.E41:
     com.android.tools.r8.graph.DexLibraryClass getHolder() -> a
 com.android.tools.r8.graph.LibraryMethod -> com.android.tools.r8.graph.t2:
     boolean $assertionsDisabled -> f
@@ -64010,7 +64025,7 @@ com.android.tools.r8.graph.LookupCompletenessHelper -> com.android.tools.r8.grap
     24:24:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
     25:31:boolean isMethodKeptInSuperTypeOrIsLibrary(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):73:79 -> a
     25:31:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
-com.android.tools.r8.graph.LookupLambdaTarget -> com.android.tools.r8.internal.g61:
+com.android.tools.r8.graph.LookupLambdaTarget -> com.android.tools.r8.internal.j61:
     com.android.tools.r8.graph.DexClassAndMethod method -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():9:9 -> <clinit>
@@ -64053,13 +64068,13 @@ com.android.tools.r8.graph.LookupResult$LookupResultSuccess -> com.android.tools
     1:1:boolean isComplete():113:113 -> g
     1:1:boolean isIncomplete():109:109 -> h
     1:1:void setIncomplete():118:118 -> i
-com.android.tools.r8.graph.LookupTarget -> com.android.tools.r8.internal.i61:
+com.android.tools.r8.graph.LookupTarget -> com.android.tools.r8.internal.l61:
     void accept(java.util.function.Consumer,java.util.function.Consumer) -> a
     boolean isLambdaTarget() -> l
     com.android.tools.r8.graph.DexClassAndMethod asMethodTarget() -> m
     com.android.tools.r8.graph.LookupLambdaTarget asLambdaTarget() -> q
     boolean isMethodTarget() -> r
-com.android.tools.r8.graph.MemberResolutionResult -> com.android.tools.r8.internal.Z61:
+com.android.tools.r8.graph.MemberResolutionResult -> com.android.tools.r8.internal.c71:
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> a
     1:1:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):25:25 -> a
@@ -64158,7 +64173,7 @@ com.android.tools.r8.graph.MethodAccessFlags$Builder -> com.android.tools.r8.gra
     1:1:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setSynthetic():360:360 -> g
     1:1:com.android.tools.r8.graph.AccessFlags$BuilderBase setSynthetic():0 -> g
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.graph.MethodAccessInfoCollection -> com.android.tools.r8.internal.t71:
+com.android.tools.r8.graph.MethodAccessInfoCollection -> com.android.tools.r8.internal.w71:
     java.util.Map directInvokes -> a
     java.util.Map interfaceInvokes -> b
     java.util.Map staticInvokes -> c
@@ -64180,8 +64195,8 @@ com.android.tools.r8.graph.MethodAccessInfoCollection -> com.android.tools.r8.in
     2:2:void forEachStaticInvoke(java.util.function.BiConsumer):72:72 -> c
     1:1:void forEachSuperInvoke(java.util.function.BiConsumer):76:76 -> d
     1:1:void forEachVirtualInvoke(java.util.function.BiConsumer):84:84 -> e
-com.android.tools.r8.graph.MethodAccessInfoCollection$1 -> com.android.tools.r8.internal.o71:
-com.android.tools.r8.graph.MethodAccessInfoCollection$Builder -> com.android.tools.r8.internal.p71:
+com.android.tools.r8.graph.MethodAccessInfoCollection$1 -> com.android.tools.r8.internal.r71:
+com.android.tools.r8.graph.MethodAccessInfoCollection$Builder -> com.android.tools.r8.internal.s71:
     java.util.Map directInvokes -> a
     java.util.Map interfaceInvokes -> b
     java.util.Map staticInvokes -> c
@@ -64233,13 +64248,13 @@ com.android.tools.r8.graph.MethodAccessInfoCollection$Builder -> com.android.too
     1:1:boolean registerInvokeStaticInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):200:200 -> h
     1:1:boolean registerInvokeSuperInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):208:208 -> i
     1:1:boolean registerInvokeVirtualInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):216:216 -> j
-com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder -> com.android.tools.r8.internal.q71:
+com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder -> com.android.tools.r8.internal.t71:
     1:1:void <init>(com.android.tools.r8.graph.MethodAccessInfoCollection$1):237:237 -> <init>
     2:2:void <init>():241:241 -> <init>
-com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder -> com.android.tools.r8.internal.r71:
+com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder -> com.android.tools.r8.internal.u71:
     1:1:void <init>(com.android.tools.r8.graph.MethodAccessInfoCollection$1):245:245 -> <init>
     2:2:void <init>():249:249 -> <init>
-com.android.tools.r8.graph.MethodAccessInfoCollection$Modifier -> com.android.tools.r8.internal.s71:
+com.android.tools.r8.graph.MethodAccessInfoCollection$Modifier -> com.android.tools.r8.internal.v71:
     1:1:void <init>(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.graph.MethodAccessInfoCollection$1):253:253 -> <init>
     2:2:void <init>(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map):261:261 -> <init>
     1:5:void addAll(com.android.tools.r8.graph.MethodAccessInfoCollection):265:269 -> a
@@ -64437,10 +64452,10 @@ com.android.tools.r8.graph.MethodCollection -> com.android.tools.r8.graph.B2:
     12:12:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):26:26 -> d
     12:12:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):290 -> d
     13:13:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):290:290 -> d
-    14:14:boolean com.android.tools.r8.graph.DexEncodedMethod.hasAnyAnnotations():892:892 -> d
+    14:14:boolean com.android.tools.r8.graph.DexEncodedMethod.hasAnyAnnotations():834:834 -> d
     14:14:com.android.tools.r8.utils.TraversalContinuation lambda$hasAnnotations$3(com.android.tools.r8.graph.DexEncodedMethod):338 -> d
-    15:15:boolean com.android.tools.r8.graph.DexEncodedMethod.hasParameterAnnotations():924:924 -> d
-    15:15:boolean com.android.tools.r8.graph.DexEncodedMethod.hasAnyAnnotations():892 -> d
+    15:15:boolean com.android.tools.r8.graph.DexEncodedMethod.hasParameterAnnotations():866:866 -> d
+    15:15:boolean com.android.tools.r8.graph.DexEncodedMethod.hasAnyAnnotations():834 -> d
     15:15:com.android.tools.r8.utils.TraversalContinuation lambda$hasAnnotations$3(com.android.tools.r8.graph.DexEncodedMethod):338 -> d
     16:17:com.android.tools.r8.utils.TraversalContinuation lambda$hasAnnotations$3(com.android.tools.r8.graph.DexEncodedMethod):339:340 -> d
     1:1:boolean hasVirtualMethods(java.util.function.Predicate):78:78 -> e
@@ -64870,11 +64885,11 @@ com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult -> com.
     boolean isSingleResolution() -> p
     1:1:boolean isVirtualTarget():244:244 -> q
     1:1:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():191:191 -> r
-com.android.tools.r8.graph.NamingLensComparable -> com.android.tools.r8.internal.q91:
+com.android.tools.r8.graph.NamingLensComparable -> com.android.tools.r8.internal.t91:
     1:1:int compareToWithNamingLens(com.android.tools.r8.graph.NamingLensComparable,com.android.tools.r8.naming.NamingLens):13:13 -> a
     2:3:int com.android.tools.r8.utils.structural.CompareToVisitorWithNamingLens.run(java.lang.Object,java.lang.Object,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):20:21 -> a
     2:3:int compareToWithNamingLens(com.android.tools.r8.graph.NamingLensComparable,com.android.tools.r8.naming.NamingLens):13 -> a
-com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.internal.y91:
+com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.internal.B91:
     com.android.tools.r8.graph.DexType nestHost -> a
     boolean $assertionsDisabled -> b
     int $r8$clinit -> c
@@ -64886,7 +64901,7 @@ com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.intern
     4:5:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens):34:35 -> a
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():45:45 -> l
     com.android.tools.r8.utils.structural.StructuralItem self() -> q
-com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.internal.z91:
+com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.internal.C91:
     com.android.tools.r8.graph.DexType nestMember -> a
     boolean $assertionsDisabled -> b
     int $r8$clinit -> c
@@ -64974,8 +64989,8 @@ com.android.tools.r8.graph.NestedGraphLens -> com.android.tools.r8.graph.M2:
     4:4:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):250:250 -> g
     boolean isLegitimateToHaveEmptyMappings() -> k
     1:19:java.lang.String toString():311:329 -> toString
-com.android.tools.r8.graph.ObjectAllocationInfoCollection -> com.android.tools.r8.internal.yc1:
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl -> com.android.tools.r8.internal.Cc1:
+com.android.tools.r8.graph.ObjectAllocationInfoCollection -> com.android.tools.r8.internal.Bc1:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl -> com.android.tools.r8.internal.Fc1:
     java.util.Map classesWithAllocationSiteTracking -> a
     java.util.Set annotationsWithUnknownSubtypeHierarchy -> c
     java.util.Set interfacesWithUnknownSubtypeHierarchy -> d
@@ -65012,8 +65027,8 @@ com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl -> com.android.too
     9:9:boolean lambda$removeAllocationsForPrunedItems$6(java.util.Set,com.android.tools.r8.graph.DexProgramClass):238:238 -> c
     1:2:boolean isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):96:97 -> d
     1:1:boolean isInterfaceWithUnknownSubtypeHierarchy(com.android.tools.r8.graph.DexProgramClass):117:117 -> e
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$1 -> com.android.tools.r8.internal.zc1:
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder -> com.android.tools.r8.internal.Bc1:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$1 -> com.android.tools.r8.internal.Cc1:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder -> com.android.tools.r8.internal.Ec1:
     com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data data -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():265:265 -> <clinit>
@@ -65083,14 +65098,14 @@ com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder -> com.and
     1:1:java.util.Set lambda$recordDirectAllocationSite$0(com.android.tools.r8.graph.DexProgramClass):338:338 -> f
     1:1:java.util.Set lambda$rewrittenWithLens$7(com.android.tools.r8.graph.DexProgramClass):467:467 -> g
     1:3:void markNoLongerInstantiated(com.android.tools.r8.graph.DexProgramClass):431:433 -> h
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data -> com.android.tools.r8.internal.Ac1:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data -> com.android.tools.r8.internal.Dc1:
     com.android.tools.r8.shaking.GraphReporter reporter -> b
     boolean trackAllocationSites -> a
     1:1:void <init>(boolean,com.android.tools.r8.shaking.GraphReporter,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$1):267:267 -> <init>
     2:4:void <init>(boolean,com.android.tools.r8.shaking.GraphReporter):272:274 -> <init>
     1:1:boolean access$300(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data):267:267 -> a
     1:1:com.android.tools.r8.shaking.GraphReporter access$400(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data):267:267 -> b
-com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.internal.fd1:
+com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.internal.id1:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.utils.structural.CompareToVisitor compareToVisitor -> m
     com.android.tools.r8.graph.DexProgramClass[] classes -> d
@@ -65146,12 +65161,12 @@ com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.interna
     1:1:java.util.Collection getStrings():264:264 -> l
     1:1:java.util.Collection getTypes():252:252 -> m
     1:1:boolean hasJumboStrings():276:276 -> n
-com.android.tools.r8.graph.ObjectToOffsetMapping$1 -> com.android.tools.r8.internal.dd1:
+com.android.tools.r8.graph.ObjectToOffsetMapping$1 -> com.android.tools.r8.internal.gd1:
     com.android.tools.r8.graph.ObjectToOffsetMapping val$mapping -> e
     1:1:void <init>(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.naming.NamingLens,java.util.function.ToIntFunction,java.util.function.ToIntFunction,com.android.tools.r8.graph.ObjectToOffsetMapping):112:112 -> <init>
     1:1:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):116:116 -> a
     2:4:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):121:121 -> a
-com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.internal.ed1:
+com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.internal.hd1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap depthOfClasses -> b
     com.android.tools.r8.graph.AppInfo appInfo -> a
     1:1:void <init>(com.android.tools.r8.graph.AppInfo):176:176 -> <init>
@@ -65163,7 +65178,7 @@ com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> c
     19:19:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
     19:19:int getDepth(com.android.tools.r8.graph.DexProgramClass):199 -> a
     20:23:int getDepth(com.android.tools.r8.graph.DexProgramClass):200:203 -> a
-com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.internal.md1:
+com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.internal.pd1:
     com.android.tools.r8.graph.DexProto[] protos -> c
     com.android.tools.r8.graph.DexMethodHandle[] methodHandles -> h
     boolean $assertionsDisabled -> i
@@ -65220,7 +65235,8 @@ com.android.tools.r8.graph.ParameterAnnotationsList -> com.android.tools.r8.grap
     4:4:boolean com.android.tools.r8.utils.ArrayUtils.isEmpty(java.lang.Object[]):84:84 -> a
     4:4:com.android.tools.r8.graph.ParameterAnnotationsList create(com.android.tools.r8.graph.DexAnnotationSet[],int):77 -> a
     5:7:com.android.tools.r8.graph.ParameterAnnotationsList create(com.android.tools.r8.graph.DexAnnotationSet[],int):77:79 -> a
-    8:8:com.android.tools.r8.graph.ParameterAnnotationsList create(com.android.tools.r8.graph.DexAnnotationSet[],int):78:78 -> a
+    8:8:com.android.tools.r8.graph.ParameterAnnotationsList empty():55:55 -> a
+    8:8:com.android.tools.r8.graph.ParameterAnnotationsList create(com.android.tools.r8.graph.DexAnnotationSet[],int):78 -> a
     9:10:boolean isAllEmpty(com.android.tools.r8.graph.DexAnnotationSet[]):83:84 -> a
     11:12:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):123:124 -> a
     13:14:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):131:132 -> a
@@ -65228,9 +65244,12 @@ com.android.tools.r8.graph.ParameterAnnotationsList -> com.android.tools.r8.grap
     18:19:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):226:227 -> a
     20:20:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.keepIf(java.util.function.Predicate):200:200 -> a
     20:20:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):227 -> a
-    21:37:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):228:244 -> a
-    38:45:com.android.tools.r8.graph.ParameterAnnotationsList rewrite(java.util.function.Function):248:255 -> a
-    46:46:com.android.tools.r8.graph.DexAnnotationSet lambda$rewrite$2(java.util.function.Function,com.android.tools.r8.graph.DexAnnotationSet):253:253 -> a
+    21:27:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):228:234 -> a
+    28:28:com.android.tools.r8.graph.ParameterAnnotationsList empty():55:55 -> a
+    28:28:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):242 -> a
+    29:29:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):244:244 -> a
+    30:37:com.android.tools.r8.graph.ParameterAnnotationsList rewrite(java.util.function.Function):248:255 -> a
+    38:38:com.android.tools.r8.graph.DexAnnotationSet lambda$rewrite$2(java.util.function.Function,com.android.tools.r8.graph.DexAnnotationSet):253:253 -> a
     1:1:int lambda$specify$1(com.android.tools.r8.graph.ParameterAnnotationsList):51:51 -> b
     1:3:boolean equals(java.lang.Object):115:117 -> equals
     1:5:com.android.tools.r8.graph.DexAnnotationSet get(int):184:188 -> g
@@ -65241,9 +65260,9 @@ com.android.tools.r8.graph.ParameterAnnotationsList -> com.android.tools.r8.grap
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():98:98 -> l
     com.android.tools.r8.utils.structural.StructuralItem self() -> q
     1:1:int size():153:153 -> size
-com.android.tools.r8.graph.PinnedPredicate -> com.android.tools.r8.internal.te1:
+com.android.tools.r8.graph.PinnedPredicate -> com.android.tools.r8.internal.we1:
     boolean isPinned(com.android.tools.r8.graph.DexDefinition) -> a
-com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.internal.nf1:
+com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.internal.qf1:
     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>
@@ -65255,7 +65274,7 @@ com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.internal.
     18:19:void accept(com.android.tools.r8.graph.DexClass):61:62 -> a
     20:21:void run(com.android.tools.r8.graph.DexProgramClass[]):66:67 -> a
     void visit(com.android.tools.r8.graph.DexClass) -> b
-com.android.tools.r8.graph.ProgramDefinition -> com.android.tools.r8.internal.of1:
+com.android.tools.r8.graph.ProgramDefinition -> com.android.tools.r8.internal.rf1:
     com.android.tools.r8.graph.ProgramDerivedContext asProgramDerivedContext(com.android.tools.r8.graph.ProgramDerivedContext) -> a
     1:1:void rewriteAllAnnotations(java.util.function.BiFunction):42:42 -> a
     com.android.tools.r8.graph.DexProgramClass getContextClass() -> b
@@ -65267,10 +65286,10 @@ com.android.tools.r8.graph.ProgramDefinition -> com.android.tools.r8.internal.of
     com.android.tools.r8.graph.ProgramDefinition asProgramDefinition() -> f
     boolean isProgramDefinition() -> g
     1:1:void clearAllAnnotations():37:37 -> s
-com.android.tools.r8.graph.ProgramDerivedContext -> com.android.tools.r8.internal.pf1:
+com.android.tools.r8.graph.ProgramDerivedContext -> com.android.tools.r8.internal.sf1:
     1:1:boolean isProgramContext():12:12 -> u
     com.android.tools.r8.graph.Definition getContext() -> v
-com.android.tools.r8.graph.ProgramDexCode -> com.android.tools.r8.internal.qf1:
+com.android.tools.r8.graph.ProgramDexCode -> com.android.tools.r8.internal.tf1:
     com.android.tools.r8.graph.ProgramMethod method -> b
     com.android.tools.r8.graph.DexCode code -> a
     1:3:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.ProgramMethod):12:14 -> <init>
@@ -65291,7 +65310,7 @@ com.android.tools.r8.graph.ProgramField -> com.android.tools.r8.graph.O2:
     com.android.tools.r8.graph.ProgramField asField() -> d
     com.android.tools.r8.graph.Definition getContext() -> v
     com.android.tools.r8.graph.ProgramField asProgramField() -> w
-com.android.tools.r8.graph.ProgramMember -> com.android.tools.r8.internal.tf1:
+com.android.tools.r8.graph.ProgramMember -> com.android.tools.r8.internal.wf1:
     com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo() -> A
     com.android.tools.r8.graph.DexProgramClass getHolder() -> a
     com.android.tools.r8.graph.DexEncodedMember getDefinition() -> h
@@ -65300,7 +65319,7 @@ com.android.tools.r8.graph.ProgramMethod -> com.android.tools.r8.graph.P2:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):21:21 -> <init>
-    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinInfo():109:109 -> A
+    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinInfo():114:114 -> A
     1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo():17 -> A
     com.android.tools.r8.graph.ProgramMethod asProgramMethod() -> E
     1:1:com.android.tools.r8.graph.DexClass getHolder():17:17 -> L
@@ -65309,19 +65328,19 @@ com.android.tools.r8.graph.ProgramMethod -> com.android.tools.r8.graph.P2:
     7:7:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
     7:7:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):59 -> a
     8:8:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):61:61 -> a
-    9:11:com.android.tools.r8.graph.DexProgramClass getHolder():102:104 -> a
-    1:1:com.android.tools.r8.graph.DexProgramClass getContextClass():72:72 -> b
+    9:11:com.android.tools.r8.graph.DexProgramClass getHolder():107:109 -> a
+    1:1:com.android.tools.r8.graph.DexProgramClass getContextClass():77:77 -> b
     1:1:com.android.tools.r8.graph.DexClass getContextClass():17 -> b
-    2:2:com.android.tools.r8.graph.DexProgramClass getContextClass():72:72 -> b
+    2:2:com.android.tools.r8.graph.DexProgramClass getContextClass():77:77 -> b
     com.android.tools.r8.graph.DexClassAndMethod asMethod() -> c
     com.android.tools.r8.graph.ProgramMethod asMethod() -> c
     com.android.tools.r8.graph.Definition getContext() -> v
     boolean isProgramMember() -> y
-com.android.tools.r8.graph.ProgramPackageCollection -> com.android.tools.r8.internal.zf1:
+com.android.tools.r8.graph.ProgramPackageCollection -> com.android.tools.r8.internal.Cf1:
     java.util.Map packages -> a
     1:2:void <init>(java.util.Map):15:16 -> <init>
     1:1:java.util.Iterator iterator():49:49 -> iterator
-com.android.tools.r8.graph.PrunedItems -> com.android.tools.r8.internal.ei1:
+com.android.tools.r8.graph.PrunedItems -> com.android.tools.r8.internal.hi1:
     com.android.tools.r8.graph.DexApplication prunedApp -> a
     java.util.Set noLongerSyntheticItems -> c
     java.util.Set removedClasses -> d
@@ -65340,8 +65359,8 @@ com.android.tools.r8.graph.PrunedItems -> com.android.tools.r8.internal.ei1:
     1:1:java.util.Set getRemovedMethods():80:80 -> f
     1:1:boolean hasRemovedClasses():72:72 -> g
     1:1:boolean isEmpty():44:44 -> h
-com.android.tools.r8.graph.PrunedItems$1 -> com.android.tools.r8.internal.ci1:
-com.android.tools.r8.graph.PrunedItems$Builder -> com.android.tools.r8.internal.di1:
+com.android.tools.r8.graph.PrunedItems$1 -> com.android.tools.r8.internal.fi1:
+com.android.tools.r8.graph.PrunedItems$Builder -> com.android.tools.r8.internal.gi1:
     com.android.tools.r8.graph.DexApplication prunedApp -> a
     java.util.Set noLongerSyntheticItems -> c
     java.util.Set removedClasses -> d
@@ -65356,145 +65375,167 @@ com.android.tools.r8.graph.PrunedItems$Builder -> com.android.tools.r8.internal.
     5:5:com.android.tools.r8.graph.PrunedItems$Builder addRemovedMethod(com.android.tools.r8.graph.DexMethod):121:121 -> a
     6:6:com.android.tools.r8.graph.PrunedItems build():126:126 -> a
     1:2:com.android.tools.r8.graph.PrunedItems$Builder addRemovedClasses(java.util.Set):110:111 -> b
-com.android.tools.r8.graph.RewrittenPrototypeDescription -> com.android.tools.r8.internal.fm1:
+com.android.tools.r8.graph.RewrittenPrototypeDescription -> com.android.tools.r8.graph.V2:
     java.util.List extraParameters -> a
     com.android.tools.r8.graph.RewrittenPrototypeDescription NONE -> d
     com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection argumentInfoCollection -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo rewrittenReturnInfo -> c
-    1:309:void <clinit>():24:332 -> <clinit>
-    1:4:void <init>():338:341 -> <init>
-    5:10:void <init>(java.util.List,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):347:352 -> <init>
-    1:4:com.android.tools.r8.graph.RewrittenPrototypeDescription createForUninstantiatedTypes(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):368:371 -> a
-    5:5:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo.toVoid(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):137:137 -> a
-    5:5:com.android.tools.r8.graph.RewrittenPrototypeDescription createForUninstantiatedTypes(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):371 -> a
-    6:6:com.android.tools.r8.graph.RewrittenPrototypeDescription createForUninstantiatedTypes(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):373:373 -> a
-    7:7:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.RewrittenPrototypeDescription.create(java.util.List,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):359:359 -> a
-    7:7:com.android.tools.r8.graph.RewrittenPrototypeDescription createForUninstantiatedTypes(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):373 -> a
-    8:8:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.RewrittenPrototypeDescription.none():382:382 -> a
-    8:8:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.RewrittenPrototypeDescription.create(java.util.List,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):360 -> a
-    8:8:com.android.tools.r8.graph.RewrittenPrototypeDescription createForUninstantiatedTypes(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):373 -> a
-    9:9:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.RewrittenPrototypeDescription.create(java.util.List,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):361:361 -> a
-    9:9:com.android.tools.r8.graph.RewrittenPrototypeDescription createForUninstantiatedTypes(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):373 -> a
-    10:10:com.android.tools.r8.graph.RewrittenPrototypeDescription createForRewrittenTypes(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):378:378 -> a
-    11:11:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.RewrittenPrototypeDescription.create(java.util.List,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):359:359 -> a
-    11:11:com.android.tools.r8.graph.RewrittenPrototypeDescription createForRewrittenTypes(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):378 -> a
-    12:12:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.RewrittenPrototypeDescription.none():382:382 -> a
-    12:12:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.RewrittenPrototypeDescription.create(java.util.List,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):360 -> a
-    12:12:com.android.tools.r8.graph.RewrittenPrototypeDescription createForRewrittenTypes(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):378 -> a
-    13:13:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.RewrittenPrototypeDescription.create(java.util.List,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):361:361 -> a
-    13:13:com.android.tools.r8.graph.RewrittenPrototypeDescription createForRewrittenTypes(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):378 -> a
-    14:15:boolean hasBeenChangedToReturnVoid(com.android.tools.r8.graph.DexItemFactory):400:401 -> a
-    16:16:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection getArgumentInfoCollection():405:405 -> a
-    17:25:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):438:446 -> a
-    26:28:com.android.tools.r8.graph.RewrittenPrototypeDescription withConstantReturn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):451:453 -> a
-    29:29:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo.toVoid(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):137:137 -> a
-    29:29:com.android.tools.r8.graph.RewrittenPrototypeDescription withConstantReturn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):455 -> a
-    30:30:com.android.tools.r8.graph.RewrittenPrototypeDescription withConstantReturn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):455:455 -> a
-    31:35:com.android.tools.r8.graph.RewrittenPrototypeDescription withRemovedArguments(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):461:465 -> a
-    36:43:com.android.tools.r8.graph.RewrittenPrototypeDescription withExtraParameters(java.util.List):484:491 -> a
-    1:1:java.util.Collection getExtraParameters():392:392 -> b
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo getRewrittenReturnInfo():419:419 -> c
-    1:1:boolean hasRewrittenReturnInfo():409:409 -> d
-    1:3:boolean isEmpty():386:388 -> e
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription none():382:382 -> f
-    1:1:int numberOfExtraParameters():396:396 -> g
-    1:1:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription.hasRewrittenReturnInfo():409:409 -> h
-    1:1:boolean requiresRewritingAtCallSite():413 -> h
-    2:2:int com.android.tools.r8.graph.RewrittenPrototypeDescription.numberOfExtraParameters():396:396 -> h
-    2:2:boolean requiresRewritingAtCallSite():414 -> h
-    3:4:boolean requiresRewritingAtCallSite():414:415 -> h
-com.android.tools.r8.graph.RewrittenPrototypeDescription$1 -> com.android.tools.r8.internal.am1:
+    1:353:void <clinit>():28:380 -> <clinit>
+    1:4:void <init>():386:389 -> <init>
+    5:10:void <init>(java.util.List,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):395:400 -> <init>
+    1:4:com.android.tools.r8.graph.RewrittenPrototypeDescription createForUninstantiatedTypes(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):416:419 -> a
+    5:5:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo.toVoid(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):145:145 -> a
+    5:5:com.android.tools.r8.graph.RewrittenPrototypeDescription createForUninstantiatedTypes(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):419 -> a
+    6:6:com.android.tools.r8.graph.RewrittenPrototypeDescription createForUninstantiatedTypes(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):421:421 -> a
+    7:7:com.android.tools.r8.graph.RewrittenPrototypeDescription create(java.util.List,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):407:407 -> a
+    7:7:com.android.tools.r8.graph.RewrittenPrototypeDescription createForUninstantiatedTypes(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):421 -> a
+    8:8:com.android.tools.r8.graph.RewrittenPrototypeDescription none():430:430 -> a
+    8:8:com.android.tools.r8.graph.RewrittenPrototypeDescription create(java.util.List,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):408 -> a
+    8:8:com.android.tools.r8.graph.RewrittenPrototypeDescription createForUninstantiatedTypes(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):421 -> a
+    9:9:com.android.tools.r8.graph.RewrittenPrototypeDescription create(java.util.List,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):409:409 -> a
+    9:9:com.android.tools.r8.graph.RewrittenPrototypeDescription createForUninstantiatedTypes(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):421 -> a
+    10:10:com.android.tools.r8.graph.RewrittenPrototypeDescription createForRewrittenTypes(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):426:426 -> a
+    11:11:com.android.tools.r8.graph.RewrittenPrototypeDescription create(java.util.List,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):407:407 -> a
+    11:11:com.android.tools.r8.graph.RewrittenPrototypeDescription createForRewrittenTypes(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):426 -> a
+    12:12:com.android.tools.r8.graph.RewrittenPrototypeDescription none():430:430 -> a
+    12:12:com.android.tools.r8.graph.RewrittenPrototypeDescription create(java.util.List,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):408 -> a
+    12:12:com.android.tools.r8.graph.RewrittenPrototypeDescription createForRewrittenTypes(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):426 -> a
+    13:13:com.android.tools.r8.graph.RewrittenPrototypeDescription create(java.util.List,com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):409:409 -> a
+    13:13:com.android.tools.r8.graph.RewrittenPrototypeDescription createForRewrittenTypes(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):426 -> a
+    14:24:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):434:444 -> a
+    25:25:java.util.List getExtraParameters():465:465 -> a
+    25:25:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):445 -> a
+    26:26:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):445:445 -> a
+    27:27:java.util.List getExtraParameters():465:465 -> a
+    27:27:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):446 -> a
+    28:31:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):446:449 -> a
+    32:32:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo getRewrittenReturnInfo():492:492 -> a
+    32:32:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):450 -> a
+    33:33:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):450:450 -> a
+    34:34:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo.combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):154:154 -> a
+    34:34:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):450 -> a
+    35:37:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo.combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo):158:160 -> a
+    35:37:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo.combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):154 -> a
+    35:37:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):450 -> a
+    38:38:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo getRewrittenReturnInfo():492:492 -> a
+    38:38:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):451 -> a
+    39:40:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection getArgumentInfoCollection():478:478 -> a
+    39:40:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):453 -> a
+    41:42:com.android.tools.r8.graph.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.RewrittenPrototypeDescription):453:454 -> a
+    43:44:boolean hasBeenChangedToReturnVoid(com.android.tools.r8.graph.DexItemFactory):473:474 -> a
+    45:45:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection getArgumentInfoCollection():478:478 -> a
+    46:54:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):511:519 -> a
+    55:57:com.android.tools.r8.graph.RewrittenPrototypeDescription withConstantReturn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):524:526 -> a
+    58:58:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo.toVoid(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):145:145 -> a
+    58:58:com.android.tools.r8.graph.RewrittenPrototypeDescription withConstantReturn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):528 -> a
+    59:59:com.android.tools.r8.graph.RewrittenPrototypeDescription withConstantReturn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):528:528 -> a
+    60:64:com.android.tools.r8.graph.RewrittenPrototypeDescription withRemovedArguments(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):534:538 -> a
+    65:72:com.android.tools.r8.graph.RewrittenPrototypeDescription withExtraParameters(java.util.List):569:576 -> a
+    1:1:java.util.List getExtraParameters():465:465 -> b
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo getRewrittenReturnInfo():492:492 -> c
+    1:1:boolean hasRewrittenReturnInfo():482:482 -> d
+    1:3:boolean isEmpty():459:461 -> e
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription none():430:430 -> f
+    1:1:int numberOfExtraParameters():469:469 -> g
+    1:1:boolean requiresRewritingAtCallSite():486:486 -> h
+    2:2:int numberOfExtraParameters():469:469 -> h
+    2:2:boolean requiresRewritingAtCallSite():487 -> h
+    3:4:boolean requiresRewritingAtCallSite():487:488 -> h
+com.android.tools.r8.graph.RewrittenPrototypeDescription$1 -> com.android.tools.r8.graph.Q2:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():31:31 -> <clinit>
-com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo -> com.android.tools.r8.internal.bm1:
+    1:1:void <clinit>():35:35 -> <clinit>
+com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo -> com.android.tools.r8.graph.R2:
     com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo NO_INFO -> a
-    1:1:void <clinit>():41:41 -> <clinit>
+    1:1:void <clinit>():45:45 -> <clinit>
+    com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo) -> a
     boolean isRemovedArgumentInfo() -> a
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo lambda$static$0(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):43:43 -> a
     com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo asRemovedArgumentInfo() -> b
-    com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo) -> b
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo lambda$static$0(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):47:47 -> b
     boolean isRewrittenTypeInfo() -> c
     com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo asRewrittenTypeInfo() -> d
-com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection -> com.android.tools.r8.internal.cm1:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection -> com.android.tools.r8.graph.S2:
     com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection EMPTY -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap argumentInfos -> a
     boolean $assertionsDisabled -> c
-    1:3:void <clinit>():179:181 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.RewrittenPrototypeDescription$1):179:179 -> <init>
-    2:3:void <init>():186:187 -> <init>
-    4:7:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap):190:193 -> <init>
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection access$100():179:179 -> a
-    2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo getArgumentInfo(int):224:224 -> a
-    3:16:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):276:289 -> a
-    17:19:int com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.peekNextOrMax(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator):311:313 -> a
-    17:19:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):290 -> a
-    20:21:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):292:293 -> a
-    22:24:int com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.peekNextOrMax(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator):311:313 -> a
-    22:24:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):294 -> a
-    25:32:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):295:302 -> a
-    33:33:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):301:301 -> a
-    34:41:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):31:38 -> a
-    34:41:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):301 -> a
-    42:45:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):303:306 -> a
+    1:3:void <clinit>():197:199 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.RewrittenPrototypeDescription$1):197:197 -> <init>
+    2:3:void <init>():204:205 -> <init>
+    4:7:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap):208:211 -> <init>
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection access$100():197:197 -> a
+    2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo getArgumentInfo(int):250:250 -> a
+    3:16:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):324:337 -> a
+    17:19:int peekNextOrMax(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator):359:361 -> a
+    17:19:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):338 -> a
+    20:21:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):340:341 -> a
+    22:24:int peekNextOrMax(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator):359:361 -> a
+    22:24:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):342 -> a
+    25:32:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):343:350 -> a
+    33:33:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):349:349 -> a
+    34:41:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo.combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):35:42 -> a
+    34:41:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):349 -> a
+    42:45:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):351:354 -> a
     46:51:boolean com.android.tools.r8.com.google.common.collect.Ordering.isOrdered(java.lang.Iterable):889:894 -> a
-    46:51:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):306 -> a
-    52:53:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):306:307 -> a
-    54:55:java.util.function.Consumer createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):321:322 -> a
-    56:57:void lambda$createParameterAnnotationsRemover$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):323:324 -> a
-    58:58:boolean lambda$createParameterAnnotationsRemover$0(int,int):325:325 -> a
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection$Builder builder():228:228 -> b
-    2:17:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.DexEncodedMethod):254:269 -> b
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection empty():197:197 -> c
-    1:2:boolean hasRemovedArguments():205:206 -> d
-    1:1:boolean isEmpty():201:201 -> e
-    1:2:int numberOfRemovedArguments():215:216 -> f
-com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection$Builder -> com.android.tools.r8.internal.cm1$a:
+    46:51:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):354 -> a
+    52:53:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):354:355 -> a
+    54:55:java.util.function.Consumer createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):369:370 -> a
+    56:57:void lambda$createParameterAnnotationsRemover$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):371:372 -> a
+    58:58:boolean lambda$createParameterAnnotationsRemover$0(int,int):373:373 -> a
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection$Builder builder():258:258 -> b
+    2:17:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.DexEncodedMethod):302:317 -> b
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection empty():215:215 -> c
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet getKeys():219:219 -> d
+    1:2:boolean hasRemovedArguments():231:232 -> e
+    1:1:boolean isEmpty():223:223 -> f
+    1:1:java.util.Iterator iterator():227:227 -> g
+    1:2:int numberOfRemovedArguments():241:242 -> h
+    1:1:int size():254:254 -> i
+com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection$Builder -> com.android.tools.r8.graph.S2$a:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap argumentInfos -> a
-    1:1:void <clinit>():231:231 -> <clinit>
-    1:1:void <init>():231:231 -> <init>
-    1:5:void addArgumentInfo(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):236:240 -> a
-    6:9:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection build():244:247 -> a
-    10:10:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection build():245:245 -> a
-com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo -> com.android.tools.r8.internal.dm1:
+    1:1:void <clinit>():261:261 -> <clinit>
+    1:1:void <init>():261:261 -> <init>
+    1:5:void addArgumentInfo(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):266:270 -> a
+    6:9:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection build():274:277 -> a
+    10:10:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection build():275:275 -> a
+com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo -> com.android.tools.r8.graph.T2:
     com.android.tools.r8.graph.DexType type -> c
-    boolean isAlwaysNull -> b
+    com.android.tools.r8.ir.analysis.value.SingleValue singleValue -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():67:67 -> <clinit>
-    1:1:void <init>(boolean,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.RewrittenPrototypeDescription$1):67:67 -> <init>
-    2:4:void <init>(boolean,com.android.tools.r8.graph.DexType):93:95 -> <init>
+    1:1:void <clinit>():71:71 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.analysis.value.SingleValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.RewrittenPrototypeDescription$1):71:71 -> <init>
+    2:4:void <init>(com.android.tools.r8.ir.analysis.value.SingleValue,com.android.tools.r8.graph.DexType):97:99 -> <init>
     boolean isRemovedArgumentInfo() -> a
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):134:134 -> a
     com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo asRemovedArgumentInfo() -> b
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):126:126 -> b
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder builder():99:99 -> e
-    1:1:com.android.tools.r8.graph.DexType getType():103:103 -> f
-    1:1:boolean isAlwaysNull():107:107 -> g
-    1:1:boolean isNeverUsed():111:111 -> h
-com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.internal.dm1$a:
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder builder():103:103 -> e
+    1:1:com.android.tools.r8.ir.analysis.value.SingleValue getSingleValue():111:111 -> f
+    1:1:com.android.tools.r8.graph.DexType getType():115:115 -> g
+    1:1:boolean hasSingleValue():107:107 -> h
+com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.graph.T2$a:
+    com.android.tools.r8.ir.analysis.value.SingleValue singleValue -> a
     com.android.tools.r8.graph.DexType type -> b
-    boolean isAlwaysNull -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():69:69 -> <clinit>
-    1:4:void <init>():69:72 -> <init>
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setType(com.android.tools.r8.graph.DexType):80:80 -> a
-    2:3:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo build():85:86 -> a
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setIsAlwaysNull():75:75 -> b
-com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo -> com.android.tools.r8.internal.em1:
+    1:1:void <clinit>():73:73 -> <clinit>
+    1:1:void <init>():73:73 -> <init>
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setSingleValue(com.android.tools.r8.ir.analysis.value.SingleValue):79:79 -> a
+    2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setType(com.android.tools.r8.graph.DexType):84:84 -> a
+    3:4:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo build():89:90 -> a
+com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo -> com.android.tools.r8.graph.U2:
     com.android.tools.r8.graph.DexType newType -> c
     com.android.tools.r8.graph.DexType oldType -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():131:131 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):140:142 -> <init>
-    1:1:com.android.tools.r8.graph.DexType access$300(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo):131:131 -> a
-    2:2:boolean hasBeenChangedToReturnVoid(com.android.tools.r8.graph.DexItemFactory):154:154 -> a
-    1:1:com.android.tools.r8.graph.DexType access$400(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo):131:131 -> b
-    2:8:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):169:175 -> b
+    1:1:void <clinit>():139:139 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):148:150 -> <init>
+    1:1:com.android.tools.r8.graph.DexType access$300(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo):139:139 -> a
+    2:2:boolean hasBeenChangedToReturnVoid(com.android.tools.r8.graph.DexItemFactory):172:172 -> a
+    3:9:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):187:193 -> a
+    1:1:com.android.tools.r8.graph.DexType access$400(com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo):139:139 -> b
     boolean isRewrittenTypeInfo() -> c
     com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo asRewrittenTypeInfo() -> d
-    1:1:com.android.tools.r8.graph.DexType getNewType():146:146 -> e
-    1:1:com.android.tools.r8.graph.DexType getOldType():150:150 -> f
-com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.internal.un1:
+    1:1:com.android.tools.r8.graph.DexType getNewType():164:164 -> e
+    1:1:com.android.tools.r8.graph.DexType getOldType():168:168 -> f
+com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.internal.mn1:
     1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):21:21 -> <init>
     void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream) -> a
     1:10:java.lang.String smali(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):26:35 -> a
@@ -65503,7 +65544,7 @@ com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.internal.un1:
     19:21:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):71:73 -> a
     1:3:void writeClassFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):64:66 -> b
     1:13:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):45:57 -> c
-com.android.tools.r8.graph.SortedProgramPackage -> com.android.tools.r8.internal.Dn1:
+com.android.tools.r8.graph.SortedProgramPackage -> com.android.tools.r8.internal.vn1:
     java.lang.String com.android.tools.r8.graph.ProgramPackage.packageDescriptor -> a
     java.util.Set com.android.tools.r8.graph.ProgramPackage.classes -> b
     boolean com.android.tools.r8.graph.ProgramPackage.$assertionsDisabled -> c
@@ -65549,13 +65590,13 @@ com.android.tools.r8.graph.SortedProgramPackage -> com.android.tools.r8.internal
     3:3:java.lang.String com.android.tools.r8.graph.ProgramPackage.toString():78:78 -> toString
     3:3:java.lang.String com.android.tools.r8.graph.ProgramPackage.toString():0 -> toString
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.graph.SortedProgramPackageCollection -> com.android.tools.r8.internal.En1:
+com.android.tools.r8.graph.SortedProgramPackageCollection -> com.android.tools.r8.internal.wn1:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
     1:4:com.android.tools.r8.graph.SortedProgramPackageCollection createWithAllProgramClasses(com.android.tools.r8.graph.AppView):16:19 -> a
     5:7:boolean addProgramClass(com.android.tools.r8.graph.DexProgramClass):26:28 -> a
-com.android.tools.r8.graph.SubtypingInfo -> com.android.tools.r8.internal.Gp1:
+com.android.tools.r8.graph.SubtypingInfo -> com.android.tools.r8.internal.yp1:
     java.util.Map typeInfo -> b
     java.util.Map subtypeMap -> c
     java.util.Set NO_DIRECT_SUBTYPE -> d
@@ -65594,7 +65635,7 @@ com.android.tools.r8.graph.SubtypingInfo -> com.android.tools.r8.internal.Gp1:
     1:1:boolean lambda$allImmediateImplementsSubtypes$3(com.android.tools.r8.graph.DexType):219:219 -> h
     1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):60:60 -> i
     1:3:java.util.Set subtypes(com.android.tools.r8.graph.DexType):166:168 -> j
-com.android.tools.r8.graph.SubtypingInfo$TypeInfo -> com.android.tools.r8.internal.Fp1:
+com.android.tools.r8.graph.SubtypingInfo$TypeInfo -> com.android.tools.r8.internal.xp1:
     java.util.Set directSubtypes -> c
     com.android.tools.r8.graph.DexType type -> a
     int hierarchyLevel -> b
@@ -65612,19 +65653,19 @@ com.android.tools.r8.graph.SubtypingInfo$TypeInfo -> com.android.tools.r8.intern
     1:5:boolean equals(java.lang.Object):246:250 -> equals
     1:1:int hashCode():241:241 -> hashCode
     1:1:java.lang.String toString():255:255 -> toString
-com.android.tools.r8.graph.SuccessfulMemberResolutionResult -> com.android.tools.r8.internal.Hp1:
+com.android.tools.r8.graph.SuccessfulMemberResolutionResult -> com.android.tools.r8.internal.zp1:
     com.android.tools.r8.graph.DexClass getInitialResolutionHolder() -> a
     com.android.tools.r8.graph.DexEncodedMember getResolvedMember() -> b
     com.android.tools.r8.graph.DexClassAndMember getResolutionPair() -> c
     com.android.tools.r8.graph.DexClass getResolvedHolder() -> d
-com.android.tools.r8.graph.ThrowingInitClassLens -> com.android.tools.r8.internal.zq1:
+com.android.tools.r8.graph.ThrowingInitClassLens -> com.android.tools.r8.internal.rq1:
     com.android.tools.r8.graph.ThrowingInitClassLens INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.graph.InitClassLens rewrittenWithLens(com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType):21:21 -> a
     1:1:com.android.tools.r8.graph.ThrowingInitClassLens getInstance():16:16 -> c
-com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.internal.Qq1:
+com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.internal.Iq1:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):14:14 -> <init>
     1:1:com.android.tools.r8.graph.TopDownClassHierarchyTraversal forAllClasses(com.android.tools.r8.graph.AppView):23:23 -> a
     2:2:com.android.tools.r8.graph.ClassHierarchyTraversal com.android.tools.r8.graph.ClassHierarchyTraversal.excludeInterfaces():60:60 -> a
@@ -65660,7 +65701,7 @@ com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r
     68:68:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):87 -> a
     69:69:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):88:88 -> a
     1:1:com.android.tools.r8.graph.TopDownClassHierarchyTraversal forProgramClasses(com.android.tools.r8.graph.AppView):50:50 -> b
-com.android.tools.r8.graph.TreeFixerBase -> com.android.tools.r8.graph.Q2:
+com.android.tools.r8.graph.TreeFixerBase -> com.android.tools.r8.graph.W2:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.util.Map programClassCache -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -65717,7 +65758,7 @@ com.android.tools.r8.graph.TreeFixerBase -> com.android.tools.r8.graph.Q2:
     83:87:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):169:173 -> a
     88:89:com.android.tools.r8.graph.DexEncodedField fixupField(com.android.tools.r8.graph.DexEncodedField):179:180 -> a
     88:89:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):173 -> a
-    90:90:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.DexField):337:337 -> a
+    90:90:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.DexField):303:303 -> a
     90:90:com.android.tools.r8.graph.DexEncodedField fixupField(com.android.tools.r8.graph.DexEncodedField):182 -> a
     90:90:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):173 -> a
     91:91:com.android.tools.r8.graph.DexEncodedField recordFieldChange(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):47:47 -> a
@@ -65751,59 +65792,68 @@ com.android.tools.r8.graph.TreeFixerBase -> com.android.tools.r8.graph.Q2:
     16:16:java.util.List fixupInnerClassAttributes(java.util.List):205 -> b
     17:28:java.util.List fixupInnerClassAttributes(java.util.List):206:217 -> b
     29:36:java.util.List fixupInnerClassAttributes(java.util.List):216:223 -> b
-    37:37:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():590:590 -> b
+    37:37:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():596:596 -> b
     37:37:java.util.List fixupInnerClassAttributes(java.util.List):223 -> b
     38:44:java.util.List fixupInnerClassAttributes(java.util.List):223:229 -> b
     45:45:java.util.List fixupInnerClassAttributes(java.util.List):227:227 -> b
     1:10:java.util.List fixupNestMemberAttributes(java.util.List):270:279 -> c
-com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.graph.R2:
-    boolean $assertionsDisabled -> b
+com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.graph.X2:
+    com.android.tools.r8.utils.TraversalContinuation continuation -> b
+    boolean $assertionsDisabled -> c
     com.android.tools.r8.graph.DexItemFactory factory -> a
-    1:1:void <clinit>():9:9 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):18:19 -> <init>
+    1:1:void <clinit>():10:10 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory):20:20 -> <init>
+    2:10:void <init>(com.android.tools.r8.graph.DexItemFactory):13:21 -> <init>
     void registerInstanceFieldRead(com.android.tools.r8.graph.DexField) -> a
     void registerInvokeDirect(com.android.tools.r8.graph.DexMethod) -> a
-    1:1:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod,boolean):51:51 -> a
-    2:2:void registerConstClass(com.android.tools.r8.graph.DexType,java.util.ListIterator):82:82 -> a
-    3:3:void registerCheckCast(com.android.tools.r8.graph.DexType):86:86 -> a
-    4:38:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):98:132 -> a
-    39:39:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):129:129 -> a
-    40:40:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):126:126 -> a
-    41:41:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):123:123 -> a
-    42:44:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):118:120 -> a
-    45:45:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):115:115 -> a
-    46:46:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):112:112 -> a
-    47:47:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):109:109 -> a
-    48:48:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):106:106 -> a
-    49:49:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):103:103 -> a
-    50:50:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):100:100 -> a
-    51:86:void registerCallSite(com.android.tools.r8.graph.DexCallSite):137:172 -> a
-    87:87:void registerCallSite(com.android.tools.r8.graph.DexCallSite):168:168 -> a
-    88:88:void registerCallSite(com.android.tools.r8.graph.DexCallSite):165:165 -> a
-    89:97:void registerCallSite(com.android.tools.r8.graph.DexCallSite):154:162 -> a
-    98:100:void registerProto(com.android.tools.r8.graph.DexProto):178:180 -> a
+    1:2:void doBreak():29:30 -> a
+    3:3:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod,boolean):62:62 -> a
+    4:4:void registerConstClass(com.android.tools.r8.graph.DexType,java.util.ListIterator):93:93 -> a
+    5:5:void registerCheckCast(com.android.tools.r8.graph.DexType):97:97 -> a
+    6:40:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):109:143 -> a
+    41:41:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):140:140 -> a
+    42:42:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):137:137 -> a
+    43:43:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):134:134 -> a
+    44:46:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):129:131 -> a
+    47:47:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):126:126 -> a
+    48:48:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):123:123 -> a
+    49:49:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):120:120 -> a
+    50:50:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):117:117 -> a
+    51:51:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):114:114 -> a
+    52:52:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):111:111 -> a
+    53:88:void registerCallSite(com.android.tools.r8.graph.DexCallSite):148:183 -> a
+    89:89:void registerCallSite(com.android.tools.r8.graph.DexCallSite):179:179 -> a
+    90:90:void registerCallSite(com.android.tools.r8.graph.DexCallSite):176:176 -> a
+    91:99:void registerCallSite(com.android.tools.r8.graph.DexCallSite):165:173 -> a
+    100:102:void registerProto(com.android.tools.r8.graph.DexProto):189:191 -> a
     void registerInvokeInterface(com.android.tools.r8.graph.DexMethod) -> b
-    1:1:void registerInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):41:41 -> b
-    2:2:void registerExceptionGuard(com.android.tools.r8.graph.DexType):94:94 -> b
+    1:1:com.android.tools.r8.utils.TraversalContinuation getTraversalContinuation():34:34 -> b
+    2:2:void registerInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):52:52 -> b
+    3:3:void registerExceptionGuard(com.android.tools.r8.graph.DexType):105:105 -> b
     void registerInitClass(com.android.tools.r8.graph.DexType) -> c
     void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField) -> c
     void registerInvokeStatic(com.android.tools.r8.graph.DexMethod) -> c
     void registerInvokeSuper(com.android.tools.r8.graph.DexMethod) -> d
-    1:1:void registerInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):47:47 -> d
-    2:2:void registerInstanceOf(com.android.tools.r8.graph.DexType):77:77 -> d
+    1:1:void registerInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):58:58 -> d
+    2:2:void registerInstanceOf(com.android.tools.r8.graph.DexType):88:88 -> d
     void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> e
     void registerStaticFieldRead(com.android.tools.r8.graph.DexField) -> e
-    1:1:void registerNewInstance(com.android.tools.r8.graph.DexType):55:55 -> e
-    1:1:void registerStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):65:65 -> f
-    2:2:void registerSafeCheckCast(com.android.tools.r8.graph.DexType):90:90 -> f
+    1:1:void registerNewInstance(com.android.tools.r8.graph.DexType):66:66 -> e
+    1:1:void registerStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):76:76 -> f
+    2:2:void registerSafeCheckCast(com.android.tools.r8.graph.DexType):101:101 -> f
     void registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> g
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> g
-    1:1:void registerStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):71:71 -> h
-com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.internal.ts1:
+    1:1:void registerStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):82:82 -> h
+com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.internal.ls1:
     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>():14:15 -> <clinit>
-    1:1:void <init>(java.lang.String,int):13:13 -> <init>
+    1:2:void <clinit>():16:17 -> <clinit>
+    1:1:void <init>(java.lang.String,int):15:15 -> <init>
+com.android.tools.r8.graph.UseRegistryWithResult -> com.android.tools.r8.internal.ms1:
+    java.lang.Object result -> d
+    1:2:void <init>(com.android.tools.r8.graph.DexItemFactory,java.lang.Object):16:17 -> <init>
+    1:2:void setResult(java.lang.Object):25:26 -> a
+    1:1:java.lang.Object getResult():21:21 -> c
 com.android.tools.r8.graph.analysis.ApiModelAnalysis -> com.android.tools.r8.internal.fz0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.androidapi.AndroidApiReferenceLevelCache referenceLevelCache -> c
@@ -65820,7 +65870,7 @@ com.android.tools.r8.graph.analysis.ApiModelAnalysis -> com.android.tools.r8.int
     15:15:void notifyMarkVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget):65:65 -> a
     16:20:void computeApiLevelForDefinition(com.android.tools.r8.graph.DexClassAndMember):74:78 -> a
     21:21:void computeApiLevelForDefinition(com.android.tools.r8.graph.DexClassAndMember):75:75 -> a
-com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.internal.rG0:
+com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.internal.uG0:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> b
     com.android.tools.r8.graph.DexString kotlinAssertionsEnabled -> c
     java.util.List jacocoInstructionSequence -> f
@@ -65896,7 +65946,7 @@ com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis ->
     92:101:boolean com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis.hasKotlincClinitAssertionCode(com.android.tools.r8.graph.ProgramMethod):160:169 -> a
     92:101:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):46 -> a
     102:102:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):47:47 -> a
-com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.internal.nN0:
+com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.internal.qN0:
     1:1:void <init>():17:17 -> <init>
     void done(com.android.tools.r8.shaking.Enqueuer) -> a
     void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing) -> a
@@ -65908,13 +65958,13 @@ com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.int
     void processNewlyLiveField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition) -> a
     void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition) -> a
     void processTracedCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry) -> a
-com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis -> com.android.tools.r8.internal.tN0:
+com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis -> com.android.tools.r8.internal.wN0:
     void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod) -> a
     void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod) -> b
     void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod) -> c
     void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod) -> d
     void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod) -> e
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.internal.AT0:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.internal.DT0:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):61:61 -> <init>
@@ -65922,8 +65972,8 @@ com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis
     1:17:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):67:83 -> a
     18:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):81:81 -> a
     19:19:void done(com.android.tools.r8.shaking.Enqueuer):89:89 -> a
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.internal.yT0:
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.internal.zT0:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.internal.BT0:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.internal.CT0:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -65931,10 +65981,10 @@ com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1):20:20 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):26:28 -> <init>
     1:18:boolean isClassDefinitelyLoadedInInstanceMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):33:50 -> a
-com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.internal.e71:
+com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.internal.h71:
     boolean hasBeenMergedIntoDifferentType(com.android.tools.r8.graph.DexType) -> a
     boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView) -> a
-com.android.tools.r8.graph.classmerging.MergedClassesCollection -> com.android.tools.r8.internal.f71:
+com.android.tools.r8.graph.classmerging.MergedClassesCollection -> com.android.tools.r8.internal.i71:
     java.util.List collection -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():15:15 -> <clinit>
@@ -65942,7 +65992,7 @@ com.android.tools.r8.graph.classmerging.MergedClassesCollection -> com.android.t
     1:1:void add(com.android.tools.r8.graph.classmerging.MergedClasses):20:20 -> a
     2:3:boolean hasBeenMergedIntoDifferentType(com.android.tools.r8.graph.DexType):32:33 -> a
     4:5:boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView):52:53 -> a
-com.android.tools.r8.graph.classmerging.VerticallyMergedClasses -> com.android.tools.r8.internal.kt1:
+com.android.tools.r8.graph.classmerging.VerticallyMergedClasses -> com.android.tools.r8.internal.dt1:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedClasses -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():17:17 -> <clinit>
@@ -65959,7 +66009,7 @@ com.android.tools.r8.graph.classmerging.VerticallyMergedClasses -> com.android.t
     1:1:java.util.Collection com.android.tools.r8.graph.classmerging.VerticallyMergedClasses.getSourcesFor(com.android.tools.r8.graph.DexType):39:39 -> e
     1:1:boolean isMergeTarget(com.android.tools.r8.graph.DexType):61 -> e
     2:2:boolean isMergeTarget(com.android.tools.r8.graph.DexType):61:61 -> e
-com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger -> com.android.tools.r8.internal.JG0:
+com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger -> com.android.tools.r8.internal.MG0:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> c
@@ -65979,7 +66029,7 @@ com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger -> com.and
     65:73:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):148:156 -> a
     74:74:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):204:204 -> a
     74:74:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):156 -> a
-    75:75:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.DexField):337:337 -> a
+    75:75:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.DexField):303:303 -> a
     75:75:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):153 -> a
     76:76:com.android.tools.r8.graph.DexEncodedField mergeSourceFieldsToTargetField(com.android.tools.r8.graph.DexEncodedField,java.util.Set):161:161 -> a
     77:77:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.append(java.lang.Iterable,java.lang.Object):52:52 -> a
@@ -65994,25 +66044,25 @@ com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger -> com.and
     86:86:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627:627 -> a
     86:86:boolean needsRelaxedType(com.android.tools.r8.graph.DexEncodedField,java.lang.Iterable):172 -> a
     87:87:boolean lambda$needsRelaxedType$6(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):173:173 -> a
-    88:88:boolean com.android.tools.r8.graph.DexEncodedField.isSynthetic():263:263 -> a
+    88:88:boolean com.android.tools.r8.graph.DexEncodedField.isSynthetic():229:229 -> a
     88:88:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):120 -> a
     89:89:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):120:120 -> a
     90:90:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627:627 -> a
     90:90:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):120 -> a
     91:91:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):121:121 -> a
-    92:92:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():237:237 -> a
+    92:92:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():203:203 -> a
     92:92:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):123 -> a
     93:93:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):123:123 -> a
     94:94:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627:627 -> a
     94:94:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):123 -> a
     95:95:void fixAccessFlags(com.android.tools.r8.graph.DexEncodedField,java.util.Collection):124:124 -> a
-    96:96:boolean com.android.tools.r8.graph.DexEncodedField.isSynthetic():263:263 -> a
+    96:96:boolean com.android.tools.r8.graph.DexEncodedField.isSynthetic():229:229 -> a
     96:96:boolean lambda$fixAccessFlags$3(com.android.tools.r8.graph.DexEncodedField):120 -> a
     1:1:java.util.LinkedList lambda$getAvailableFieldsByRelaxedInfo$1(com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo):114:114 -> b
-    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():237:237 -> b
+    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():203:203 -> b
     2:2:boolean lambda$fixAccessFlags$4(com.android.tools.r8.graph.DexEncodedField):123 -> b
     1:1:void setClassIdField(com.android.tools.r8.graph.DexEncodedField):129:129 -> c
-com.android.tools.r8.horizontalclassmerging.ClassMerger -> com.android.tools.r8.internal.QG0:
+com.android.tools.r8.horizontalclassmerging.ClassMerger -> com.android.tools.r8.internal.TG0:
     com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder classMethodsBuilder -> f
     boolean $assertionsDisabled -> n
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
@@ -66027,130 +66077,125 @@ com.android.tools.r8.horizontalclassmerging.ClassMerger -> com.android.tools.r8.
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> e
     com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger classInitializerMerger -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap classIdentifiers -> g
-    1:5:void <clinit>():55:59 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Collection,com.android.tools.r8.horizontalclassmerging.ClassMerger$1):55:55 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Collection):85:85 -> <init>
-    3:39:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Collection):67:103 -> <init>
-    1:2:void buildClassIdentifierMap():107:108 -> a
-    3:3:void lambda$buildClassIdentifierMap$0(com.android.tools.r8.graph.DexProgramClass):108:108 -> a
-    4:4:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):114:114 -> a
-    5:13:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):121:129 -> a
-    5:13:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):115 -> a
+    1:5:void <clinit>():51:55 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Collection,com.android.tools.r8.horizontalclassmerging.ClassMerger$1):51:51 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Collection):81:81 -> <init>
+    3:39:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Collection):63:99 -> <init>
+    1:2:void buildClassIdentifierMap():103:104 -> a
+    3:3:void lambda$buildClassIdentifierMap$0(com.android.tools.r8.graph.DexProgramClass):104:104 -> a
+    4:4:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):110:110 -> a
+    5:13:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):117:125 -> a
+    5:13:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111 -> a
     14:14:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):306:306 -> a
-    14:14:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):129 -> a
-    14:14:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):115 -> a
+    14:14:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):125 -> a
+    14:14:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111 -> a
     15:15:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):310:310 -> a
     15:15:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):306 -> a
-    15:15:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):129 -> a
-    15:15:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):115 -> a
-    16:19:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):130:133 -> a
-    16:19:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):115 -> a
-    20:20:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.createForClassInitializer():79:79 -> a
-    20:20:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):136 -> a
-    20:20:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):115 -> a
-    21:26:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):137:142 -> a
-    21:26:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):115 -> a
-    27:27:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):277:277 -> a
-    27:27:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):142 -> a
-    27:27:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):115 -> a
-    28:35:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):145:152 -> a
-    28:35:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):115 -> a
-    36:36:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):116:116 -> a
-    37:41:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):159:163 -> a
-    42:53:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):161:172 -> a
-    54:54:void lambda$mergeInstanceInitializers$2(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger):199:199 -> a
-    55:55:void lambda$mergeVirtualMethods$3(com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger):213:213 -> a
-    56:56:boolean lambda$fixNestMemberAttributes$5(com.android.tools.r8.graph.NestMemberClassAttribute):267:267 -> a
-    57:57:void lambda$mergeInterfaces$6(java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):291:291 -> a
-    58:58:void lambda$mergeInterfaces$7(java.util.function.Consumer):291:291 -> a
-    59:61:void lambda$mergeInterfaces$8(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):294:296 -> a
-    62:62:void lambda$mergeInterfaces$9(java.util.Set,com.android.tools.r8.graph.DexProgramClass):302:302 -> a
-    1:2:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):186:187 -> b
+    15:15:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):125 -> a
+    15:15:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111 -> a
+    16:21:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):126:131 -> a
+    16:21:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111 -> a
+    22:22:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.createForClassInitializer():79:79 -> a
+    22:22:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):132 -> a
+    22:22:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111 -> a
+    23:36:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):132:145 -> a
+    23:36:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111 -> a
+    37:37:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):112:112 -> a
+    38:42:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):152:156 -> a
+    43:54:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):154:165 -> a
+    55:55:void lambda$mergeInstanceInitializers$2(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger):192:192 -> a
+    56:56:void lambda$mergeVirtualMethods$3(com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger):206:206 -> a
+    57:57:boolean lambda$fixNestMemberAttributes$5(com.android.tools.r8.graph.NestMemberClassAttribute):254:254 -> a
+    58:58:void lambda$mergeInterfaces$6(java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):278:278 -> a
+    59:59:void lambda$mergeInterfaces$7(java.util.function.Consumer):278:278 -> a
+    60:62:void lambda$mergeInterfaces$8(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):281:283 -> a
+    63:63:void lambda$mergeInterfaces$9(java.util.Set,com.android.tools.r8.graph.DexProgramClass):289:289 -> a
+    1:2:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):179:180 -> b
     3:3:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> b
-    3:3:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):188 -> b
-    4:6:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):188:190 -> b
-    7:7:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):187:187 -> b
-    8:8:void lambda$mergeVirtualMethods$4(com.android.tools.r8.graph.DexProgramClass):214:214 -> b
-    9:9:void fixAccessFlags():248:248 -> b
+    3:3:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):181 -> b
+    4:6:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):181:183 -> b
+    7:7:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):180:180 -> b
+    8:8:void lambda$mergeVirtualMethods$4(com.android.tools.r8.graph.DexProgramClass):207:207 -> b
+    9:9:void fixAccessFlags():235:235 -> b
     10:10:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627:627 -> b
-    10:10:void fixAccessFlags():248 -> b
-    11:13:void fixAccessFlags():249:251 -> b
+    10:10:void fixAccessFlags():235 -> b
+    11:13:void fixAccessFlags():236:238 -> b
     14:14:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627:627 -> b
-    14:14:void fixAccessFlags():251 -> b
-    15:15:void fixAccessFlags():252:252 -> b
-    16:19:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):329:332 -> b
-    20:20:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields():308:308 -> b
-    20:20:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):333 -> b
-    21:21:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():218:218 -> b
-    21:21:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields():309 -> b
-    21:21:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):333 -> b
-    22:22:boolean com.android.tools.r8.graph.AppView.hasLiveness():611:611 -> b
-    22:22:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():218 -> b
-    22:22:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields():309 -> b
-    22:22:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):333 -> b
-    23:30:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():218:225 -> b
-    23:30:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields():309 -> b
-    23:30:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):333 -> b
-    31:31:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.FieldAccessFlags.createPublicFinalSynthetic():80:80 -> b
-    31:31:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():226 -> b
-    31:31:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields():309 -> b
-    31:31:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):333 -> b
-    32:49:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():227:244 -> b
-    32:49:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields():309 -> b
-    32:49:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):333 -> b
-    50:51:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields():311:312 -> b
-    50:51:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):333 -> b
-    52:54:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):206:208 -> b
-    52:54:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):334 -> b
-    55:56:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):335:336 -> b
-    57:58:void com.android.tools.r8.graph.DexProgramClass.forEachProgramMember(java.util.function.Consumer):214:215 -> b
-    57:58:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):336 -> b
-    1:1:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):157:157 -> c
+    14:14:void fixAccessFlags():238 -> b
+    15:15:void fixAccessFlags():239:239 -> b
+    16:19:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):316:319 -> b
+    20:20:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields():295:295 -> b
+    20:20:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):320 -> b
+    21:21:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():211:211 -> b
+    21:21:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields():296 -> b
+    21:21:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):320 -> b
+    22:22:boolean com.android.tools.r8.graph.AppView.hasLiveness():616:616 -> b
+    22:22:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():211 -> b
+    22:22:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields():296 -> b
+    22:22:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):320 -> b
+    23:28:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():211:216 -> b
+    23:28:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields():296 -> b
+    23:28:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):320 -> b
+    29:29:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.FieldAccessFlags.createPublicFinalSynthetic():80:80 -> b
+    29:29:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():217 -> b
+    29:29:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields():296 -> b
+    29:29:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):320 -> b
+    30:44:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():217:231 -> b
+    30:44:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields():296 -> b
+    30:44:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):320 -> b
+    45:46:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields():298:299 -> b
+    45:46:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):320 -> b
+    47:49:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):199:201 -> b
+    47:49:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):321 -> b
+    50:51:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):322:323 -> b
+    52:53:void com.android.tools.r8.graph.DexProgramClass.forEachProgramMember(java.util.function.Consumer):214:215 -> b
+    52:53:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):323 -> b
+    1:1:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):150:150 -> c
     2:2:void com.android.tools.r8.graph.DexProgramClass.forEachProgramDirectMethod(java.util.function.Consumer):254:254 -> c
-    2:2:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):157 -> c
-    3:3:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):177:177 -> c
-    4:4:void mergeInstanceInitializers(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):197:197 -> c
-    5:13:void fixNestMemberAttributes():257:265 -> c
-    1:4:void mergeAnnotations():275:278 -> d
-    1:2:void mergeInstanceFields():316:317 -> e
+    2:2:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):150 -> c
+    3:3:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):170:170 -> c
+    4:4:void mergeInstanceInitializers(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):190:190 -> c
+    5:13:void fixNestMemberAttributes():244:252 -> c
+    1:4:void mergeAnnotations():262:265 -> d
+    1:2:void mergeInstanceFields():303:304 -> e
     1:1:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():347:347 -> f
-    1:1:void mergeInterfaces():285 -> f
-    2:20:void mergeInterfaces():286:304 -> f
+    1:1:void mergeInterfaces():272 -> f
+    2:20:void mergeInterfaces():273:291 -> f
     21:21:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.create(java.util.Collection):55:55 -> f
-    21:21:void mergeInterfaces():304 -> f
+    21:21:void mergeInterfaces():291 -> f
     22:22:void com.android.tools.r8.graph.DexTypeList.<init>(java.util.Collection):47:47 -> f
     22:22:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.create(java.util.Collection):55 -> f
-    22:22:void mergeInterfaces():304 -> f
+    22:22:void mergeInterfaces():291 -> f
     23:23:void com.android.tools.r8.graph.DexClass.setInterfaces(com.android.tools.r8.graph.DexTypeList):173:173 -> f
-    23:23:void mergeInterfaces():304 -> f
-    1:3:void mergeStaticFields():321:323 -> g
-    1:3:void mergeVirtualMethods():212:214 -> h
-com.android.tools.r8.horizontalclassmerging.ClassMerger$1 -> com.android.tools.r8.internal.OG0:
-com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder -> com.android.tools.r8.internal.PG0:
+    23:23:void mergeInterfaces():291 -> f
+    1:3:void mergeStaticFields():308:310 -> g
+    1:3:void mergeVirtualMethods():205:207 -> h
+com.android.tools.r8.horizontalclassmerging.ClassMerger$1 -> com.android.tools.r8.internal.RG0:
+com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder -> com.android.tools.r8.internal.SG0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.horizontalclassmerging.IRCodeProvider codeProvider -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> c
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> d
-    1:1:void <clinit>():339:339 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):349:353 -> <init>
-    1:15:java.util.List createVirtualMethodMergers():357:371 -> a
-    16:16:void lambda$createVirtualMethodMergers$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass):361:361 -> a
+    1:1:void <clinit>():326:326 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):336:340 -> <init>
+    1:15:java.util.List createVirtualMethodMergers():344:358 -> a
+    16:16:void lambda$createVirtualMethodMergers$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass):348:348 -> a
     17:17:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):274:274 -> a
-    17:17:void lambda$createVirtualMethodMergers$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass):361 -> a
-    18:18:void lambda$createVirtualMethodMergers$1(java.util.Map,com.android.tools.r8.graph.ProgramMethod):365:365 -> a
-    19:22:void lambda$createVirtualMethodMergers$1(java.util.Map,com.android.tools.r8.graph.ProgramMethod):364:367 -> a
-    23:23:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder lambda$createVirtualMethodMergers$0(com.android.tools.r8.graph.DexMethodSignature):366:366 -> a
-    24:30:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):386:392 -> a
-    31:34:void com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.createClassIdField():378:381 -> a
-    31:34:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):393 -> a
-    35:35:void com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.createClassIdField():380:380 -> a
-    35:35:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):393 -> a
-    36:36:void com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.createClassIdField():379:379 -> a
-    36:36:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):393 -> a
-    37:37:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):396:396 -> a
-    38:38:boolean lambda$build$3(com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger):390:390 -> a
-com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder -> com.android.tools.r8.internal.RG0:
+    17:17:void lambda$createVirtualMethodMergers$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass):348 -> a
+    18:18:void lambda$createVirtualMethodMergers$1(java.util.Map,com.android.tools.r8.graph.ProgramMethod):352:352 -> a
+    19:22:void lambda$createVirtualMethodMergers$1(java.util.Map,com.android.tools.r8.graph.ProgramMethod):351:354 -> a
+    23:23:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder lambda$createVirtualMethodMergers$0(com.android.tools.r8.graph.DexMethodSignature):353:353 -> a
+    24:30:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):373:379 -> a
+    31:34:void com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.createClassIdField():365:368 -> a
+    31:34:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):380 -> a
+    35:35:void com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.createClassIdField():367:367 -> a
+    35:35:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):380 -> a
+    36:36:void com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.createClassIdField():366:366 -> a
+    36:36:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):380 -> a
+    37:37:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):383:383 -> a
+    38:38:boolean lambda$build$3(com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger):377:377 -> a
+com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder -> com.android.tools.r8.internal.UG0:
     java.util.List virtualMethods -> b
     java.util.List directMethods -> c
     java.util.Set reservedMethods -> a
@@ -66163,7 +66208,7 @@ com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder -> com.android.t
     6:11:void setClassMethods(com.android.tools.r8.graph.DexProgramClass):37:42 -> a
     1:3:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):21:23 -> b
     4:4:boolean lambda$setClassMethods$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):39:39 -> b
-com.android.tools.r8.horizontalclassmerging.ClassStaticFieldsMerger -> com.android.tools.r8.internal.oH0:
+com.android.tools.r8.horizontalclassmerging.ClassStaticFieldsMerger -> com.android.tools.r8.internal.rH0:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> b
     java.util.Map targetFields -> d
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> c
@@ -66173,7 +66218,7 @@ com.android.tools.r8.horizontalclassmerging.ClassStaticFieldsMerger -> com.andro
     1:5:boolean isFresh(com.android.tools.r8.graph.DexField):32:36 -> a
     6:11:void addField(com.android.tools.r8.graph.DexEncodedField):45:50 -> a
     12:12:void addField(com.android.tools.r8.graph.DexEncodedField):47:47 -> a
-    13:13:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.DexField):337:337 -> a
+    13:13:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.DexField):303:303 -> a
     13:13:void addField(com.android.tools.r8.graph.DexEncodedField):53 -> a
     14:16:void addField(com.android.tools.r8.graph.DexEncodedField):54:56 -> a
     17:17:void addFields(com.android.tools.r8.graph.DexProgramClass):60:60 -> a
@@ -66187,7 +66232,7 @@ com.android.tools.r8.horizontalclassmerging.ClassStaticFieldsMerger -> com.andro
     20:20:void com.android.tools.r8.graph.DexClass.forEachStaticField(java.util.function.Consumer):335 -> a
     20:20:void addFields(com.android.tools.r8.graph.DexProgramClass):60 -> a
     21:21:void merge():64:64 -> a
-com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint -> com.android.tools.r8.internal.IJ0:
+com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint -> com.android.tools.r8.internal.LJ0:
     boolean $assertionsDisabled -> o
     com.android.tools.r8.graph.DexField classIdField -> m
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap typeConstructors -> n
@@ -66201,7 +66246,7 @@ com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint -> com.android
     13:16:boolean lambda$prepareMultiConstructorInstructions$4(int,com.android.tools.r8.utils.IntBox,int[],com.android.tools.r8.ir.conversion.IRBuilder):101 -> a
     1:1:void lambda$addRegisterClassIdAssignment$1(int,com.android.tools.r8.ir.conversion.IRBuilder):74:74 -> b
     2:2:void lambda$addConstantRegisterClassIdAssignment$2(int,int,com.android.tools.r8.ir.conversion.IRBuilder):81:81 -> b
-    3:3:void com.android.tools.r8.ir.conversion.IRBuilder.addIntConst(int,long):1244:1244 -> b
+    3:3:void com.android.tools.r8.ir.conversion.IRBuilder.addIntConst(int,long):1260:1260 -> b
     3:3:void lambda$addConstantRegisterClassIdAssignment$2(int,int,com.android.tools.r8.ir.conversion.IRBuilder):81 -> b
     1:4:void addConstantRegisterClassIdAssignment(int):79:82 -> i
     5:8:void prepareInstructions():135:138 -> i
@@ -66209,7 +66254,7 @@ com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint -> com.android
     2:3:void addRegisterClassIdAssignment(int):73:74 -> j
     1:33:void prepareMultiConstructorInstructions():86:118 -> k
     1:6:void prepareSingleConstructorInstructions():125:130 -> l
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger -> com.android.tools.r8.internal.CR0:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger -> com.android.tools.r8.internal.FR0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> b
     com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions options -> c
@@ -66240,7 +66285,7 @@ com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger -> com.android
     52:52:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):498:498 -> a
     52:52:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):126 -> a
     53:55:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):130:130 -> a
-    56:56:void com.android.tools.r8.graph.AppView.rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):683:683 -> a
+    56:56:void com.android.tools.r8.graph.AppView.rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):688:688 -> a
     56:56:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):130 -> a
     57:63:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):134:140 -> a
     64:64:com.android.tools.r8.graph.PrunedItems$Builder com.android.tools.r8.graph.PrunedItems.builder():36:36 -> a
@@ -66260,16 +66305,16 @@ com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger -> com.android
     12:12:boolean lambda$createFieldAccessInfoCollectionModifier$3(com.android.tools.r8.graph.DexEncodedMethod):161:161 -> b
     13:13:void lambda$createFieldAccessInfoCollectionModifier$4(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):162:162 -> b
     14:21:boolean verifyNoCyclesInInterfaceHierarchies(java.util.Collection):240:247 -> b
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode -> com.android.tools.r8.internal.BR0:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode -> com.android.tools.r8.internal.ER0:
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode FINAL -> b
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode INITIAL -> a
     1:2:void <clinit>():30:31 -> <clinit>
     1:1:void <init>(java.lang.String,int):29:29 -> <init>
     1:1:boolean isFinal():38:38 -> a
     1:1:boolean isInitial():34:34 -> b
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerCfCode -> com.android.tools.r8.internal.DR0:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerCfCode -> com.android.tools.r8.internal.GR0:
     1:1:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):26:26 -> <init>
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens -> com.android.tools.r8.internal.GR0:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens -> com.android.tools.r8.internal.JR0:
     java.util.Map methodExtraParameters -> n
     com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses mergedClasses -> o
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$1):30:30 -> <init>
@@ -66293,8 +66338,8 @@ com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens -> co
     3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> g
     3:3:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.prependSingleton(java.lang.Object,java.lang.Iterable):136 -> g
     3:3:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):49 -> g
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$1 -> com.android.tools.r8.internal.ER0:
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.FR0:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$1 -> com.android.tools.r8.internal.HR0:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.IR0:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap newMethodSignatures -> c
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap newFieldSignatures -> a
     java.util.Map methodExtraParameters -> d
@@ -66341,11 +66386,11 @@ com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Build
     2:2:void moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):166 -> c
     3:3:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean):171:171 -> c
     3:3:void moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):166 -> c
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerUtils -> com.android.tools.r8.internal.HR0:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerUtils -> com.android.tools.r8.internal.KR0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:6:boolean isClassIdField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):14:19 -> a
-com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses -> com.android.tools.r8.internal.JR0:
+com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses -> com.android.tools.r8.internal.MR0:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedClasses -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():19:19 -> <clinit>
@@ -66373,7 +66418,7 @@ com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses -> com.and
     2:2:boolean hasBeenMergedOrIsMergeTarget(com.android.tools.r8.graph.DexType):89:89 -> d
     1:1:boolean isEmpty():80:80 -> e
     2:2:boolean isMergeTarget(com.android.tools.r8.graph.DexType):85:85 -> e
-com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder -> com.android.tools.r8.internal.IR0:
+com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder -> com.android.tools.r8.internal.LR0:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap mergedClasses -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():107:107 -> <clinit>
@@ -66383,11 +66428,11 @@ com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder ->
     4:4:void lambda$addMergeGroup$0(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.DexProgramClass):118:118 -> a
     5:5:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder addMergeGroups(java.lang.Iterable):122:122 -> a
     6:6:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses build():127:127 -> a
-com.android.tools.r8.horizontalclassmerging.IRCodeProvider -> com.android.tools.r8.internal.WR0:
+com.android.tools.r8.horizontalclassmerging.IRCodeProvider -> com.android.tools.r8.internal.ZR0:
     com.android.tools.r8.graph.AppView appViewForConversion -> a
     1:10:void <init>(com.android.tools.r8.graph.AppView):17:26 -> <init>
     1:3:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod):31:33 -> a
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerAnalysis -> com.android.tools.r8.internal.fU0:
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerAnalysis -> com.android.tools.r8.internal.iU0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():36:36 -> <clinit>
     1:1:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription$Builder com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):82:82 -> a
@@ -66411,7 +66456,7 @@ com.android.tools.r8.horizontalclassmerging.InstanceInitializerAnalysis -> com.a
     231:231:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
     231:231:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInitializationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):171 -> a
     232:233:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInitializationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):173:174 -> a
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription -> com.android.tools.r8.internal.hU0:
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription -> com.android.tools.r8.internal.kU0:
     java.util.Map instanceFieldAssignmentsPre -> a
     java.util.Map instanceFieldAssignmentsPost -> b
     com.android.tools.r8.graph.DexTypeList relaxedParameters -> e
@@ -66454,7 +66499,7 @@ com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription -> co
     129:129:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):228:228 -> a
     1:8:boolean equals(java.lang.Object):236:243 -> equals
     1:1:int hashCode():248:248 -> hashCode
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription$Builder -> com.android.tools.r8.internal.gU0:
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription$Builder -> com.android.tools.r8.internal.jU0:
     java.util.Map instanceFieldAssignmentsPre -> c
     java.util.Map instanceFieldAssignmentsPost -> d
     java.util.List parentConstructorArguments -> f
@@ -66474,7 +66519,7 @@ com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription$Build
     12:12:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription build():299 -> a
     13:14:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription build():299:300 -> a
     1:1:boolean isValid():309:309 -> b
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger -> com.android.tools.r8.internal.lU0:
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger -> com.android.tools.r8.internal.oU0:
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> g
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -66484,78 +66529,75 @@ com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger -> com.and
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap classIdentifiers -> b
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> d
-    1:1:void <clinit>():43:43 -> <clinit>
-    1:14:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.List,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription):71:84 -> <init>
-    1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndMethod.getParameter(int):67:67 -> a
-    1:1:com.android.tools.r8.graph.DexType lambda$getNewMethodReference$0(int,com.android.tools.r8.graph.ProgramMethod):124 -> a
-    2:2:int getArity():89:89 -> a
-    3:12:com.android.tools.r8.graph.DexMethod getNewMethodReference(com.android.tools.r8.graph.ProgramMethod,boolean):113:122 -> a
-    13:23:com.android.tools.r8.graph.DexMethod getNewMethodReference(com.android.tools.r8.graph.ProgramMethod,boolean):120:130 -> a
-    24:24:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createInstanceInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2305:2305 -> a
-    24:24:com.android.tools.r8.graph.DexMethod getNewMethodReference(com.android.tools.r8.graph.ProgramMethod,boolean):130 -> a
-    25:29:com.android.tools.r8.graph.DexMethod getSyntheticMethodReference(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):150:150 -> a
-    30:44:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):308:322 -> a
-    45:56:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):320:331 -> a
+    1:1:void <clinit>():40:40 -> <clinit>
+    1:14:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.List,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription):68:81 -> <init>
+    1:1:int getArity():86:86 -> a
+    2:11:com.android.tools.r8.graph.DexMethod getNewMethodReference(com.android.tools.r8.graph.ProgramMethod,boolean):110:119 -> a
+    12:22:com.android.tools.r8.graph.DexMethod getNewMethodReference(com.android.tools.r8.graph.ProgramMethod,boolean):117:127 -> a
+    23:23:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createInstanceInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2305:2305 -> a
+    23:23:com.android.tools.r8.graph.DexMethod getNewMethodReference(com.android.tools.r8.graph.ProgramMethod,boolean):127 -> a
+    24:24:com.android.tools.r8.graph.DexType lambda$getNewMethodReference$0(int,com.android.tools.r8.graph.ProgramMethod):121:121 -> a
+    25:29:com.android.tools.r8.graph.DexMethod getSyntheticMethodReference(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):147:147 -> a
+    30:44:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):305:319 -> a
+    45:56:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):317:328 -> a
     57:59:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethods(java.lang.Iterable,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):179:181 -> a
     57:59:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethods(java.lang.Iterable,com.android.tools.r8.graph.DexMethod):175 -> a
-    57:59:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):331 -> a
-    60:68:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):332:340 -> a
+    57:59:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):328 -> a
+    60:68:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):329:337 -> a
     69:69:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.recordNewMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):186:186 -> a
-    69:69:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):339 -> a
-    70:84:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):346:360 -> a
-    85:90:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):359:364 -> a
-    91:91:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewAccessFlags():271:271 -> a
-    91:91:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):367 -> a
-    92:94:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):368:370 -> a
-    95:96:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):280:281 -> a
-    95:96:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):371 -> a
-    97:97:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getOriginalMethodReference():134:134 -> a
-    97:97:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):283 -> a
-    97:97:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):371 -> a
-    98:98:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getRepresentative():138:138 -> a
-    98:98:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getOriginalMethodReference():134 -> a
-    98:98:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):283 -> a
-    98:98:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):371 -> a
-    99:99:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getOriginalMethodReference():134:134 -> a
-    99:99:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):283 -> a
-    99:99:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):371 -> a
-    100:100:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):283:283 -> a
-    100:100:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):371 -> a
-    101:109:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):281:289 -> a
-    101:109:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):371 -> a
-    110:110:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getRepresentative():138:138 -> a
-    110:110:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):290 -> a
-    110:110:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):371 -> a
-    111:113:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):290:292 -> a
-    111:113:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):371 -> a
-    114:119:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.createClassIdToInstanceInitializerMap():158:163 -> a
-    114:119:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):293 -> a
-    114:119:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):371 -> a
-    120:120:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.createClassIdToInstanceInitializerMap():161:161 -> a
-    120:120:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):293 -> a
-    120:120:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):371 -> a
-    121:121:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):295:295 -> a
-    121:121:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):371 -> a
-    122:126:com.android.tools.r8.cf.CfVersion com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewClassFileVersion():98:102 -> a
-    122:126:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):373 -> a
-    127:127:com.android.tools.r8.cf.CfVersion com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewClassFileVersion():101:101 -> a
-    127:127:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):373 -> a
-    128:129:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):374:375 -> a
-    130:130:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):277:277 -> a
-    130:130:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):375 -> a
-    131:136:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):376:381 -> a
-    137:140:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):380:383 -> a
-    141:141:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    141:141:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):383 -> a
-    142:142:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):384:384 -> a
-    143:143:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):383:383 -> a
-    1:1:java.util.List getInstanceInitializers():93:93 -> b
-    2:7:com.android.tools.r8.graph.DexMethod moveInstanceInitializer(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):249:254 -> b
-    8:22:com.android.tools.r8.graph.DexMethod moveInstanceInitializer(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):250:264 -> b
-    1:1:boolean hasInstanceInitializerDescription():244:244 -> c
-    1:1:boolean isSingleton():300:300 -> d
-    1:1:int size():169:169 -> e
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder -> com.android.tools.r8.internal.kU0:
+    69:69:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):336 -> a
+    70:84:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):343:357 -> a
+    85:92:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):356:363 -> a
+    93:93:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewAccessFlags():268:268 -> a
+    93:93:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):364 -> a
+    94:94:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):364:364 -> a
+    95:96:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):277:278 -> a
+    95:96:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    97:97:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getOriginalMethodReference():131:131 -> a
+    97:97:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):280 -> a
+    97:97:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    98:98:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getRepresentative():135:135 -> a
+    98:98:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getOriginalMethodReference():131 -> a
+    98:98:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):280 -> a
+    98:98:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    99:99:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getOriginalMethodReference():131:131 -> a
+    99:99:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):280 -> a
+    99:99:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    100:100:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):280:280 -> a
+    100:100:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    101:109:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):278:286 -> a
+    101:109:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    110:110:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getRepresentative():135:135 -> a
+    110:110:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):287 -> a
+    110:110:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    111:113:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):287:289 -> a
+    111:113:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    114:119:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.createClassIdToInstanceInitializerMap():155:160 -> a
+    114:119:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):290 -> a
+    114:119:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    120:120:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.createClassIdToInstanceInitializerMap():158:158 -> a
+    120:120:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):290 -> a
+    120:120:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    121:121:com.android.tools.r8.graph.Code com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,int):292:292 -> a
+    121:121:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    122:122:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):365:365 -> a
+    123:127:com.android.tools.r8.cf.CfVersion com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewClassFileVersion():95:99 -> a
+    123:127:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):367 -> a
+    128:128:com.android.tools.r8.cf.CfVersion com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewClassFileVersion():98:98 -> a
+    128:128:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):367 -> a
+    129:138:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):367:376 -> a
+    139:142:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):375:378 -> a
+    143:143:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    143:143:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):378 -> a
+    144:144:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):379:379 -> a
+    145:145:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):378:378 -> a
+    1:1:java.util.List getInstanceInitializers():90:90 -> b
+    2:7:com.android.tools.r8.graph.DexMethod moveInstanceInitializer(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):246:251 -> b
+    8:22:com.android.tools.r8.graph.DexMethod moveInstanceInitializer(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):247:261 -> b
+    1:1:boolean hasInstanceInitializerDescription():241:241 -> c
+    1:1:boolean isSingleton():297:297 -> d
+    1:1:int size():166:166 -> e
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder -> com.android.tools.r8.internal.nU0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> f
     java.util.List instanceInitializerGroups -> d
@@ -66563,24 +66605,24 @@ com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder ->
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap classIdentifiers -> b
     boolean $assertionsDisabled -> g
     int estimatedDexCodeSize -> c
-    1:1:void <clinit>():172:172 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):185:185 -> <init>
-    2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):177:190 -> <init>
-    1:2:void createNewGroup():194:195 -> a
-    3:6:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):200:203 -> a
+    1:1:void <clinit>():169:169 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):182:182 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):174:187 -> <init>
+    1:2:void createNewGroup():191:192 -> a
+    3:6:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):197:200 -> a
     7:7:int com.android.tools.r8.utils.InternalOptions.minimumVerificationSizeLimitInBytes():300:300 -> a
-    7:7:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):203 -> a
-    8:8:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):203:203 -> a
-    9:10:void com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder.createNewGroup():194:195 -> a
-    9:10:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):205 -> a
-    11:12:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):208:209 -> a
-    13:14:java.util.List build(com.android.tools.r8.horizontalclassmerging.MergeGroup):219:220 -> a
-    15:15:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger lambda$build$0(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.List):223:223 -> a
-    16:16:void com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.List,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):61:61 -> a
-    16:16:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger lambda$build$0(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.List):223 -> a
-    17:20:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger buildSingle(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription):229:232 -> a
-    1:1:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder addEquivalent(com.android.tools.r8.graph.ProgramMethod):214:214 -> b
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerMergerCollection -> com.android.tools.r8.internal.mU0:
+    7:7:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):200 -> a
+    8:8:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):200:200 -> a
+    9:10:void com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder.createNewGroup():191:192 -> a
+    9:10:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):202 -> a
+    11:12:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):205:206 -> a
+    13:14:java.util.List build(com.android.tools.r8.horizontalclassmerging.MergeGroup):216:217 -> a
+    15:15:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger lambda$build$0(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.List):220:220 -> a
+    16:16:void com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.List,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):58:58 -> a
+    16:16:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger lambda$build$0(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.List):220 -> a
+    17:20:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger buildSingle(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription):226:229 -> a
+    1:1:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder addEquivalent(com.android.tools.r8.graph.ProgramMethod):211:211 -> b
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerMergerCollection -> com.android.tools.r8.internal.pU0:
     java.util.List instanceInitializerMergers -> a
     java.util.Map equivalentInstanceInitializerMergers -> b
     1:3:void <init>(java.util.List,java.util.Map):34:36 -> <init>
@@ -66595,7 +66637,7 @@ com.android.tools.r8.horizontalclassmerging.InstanceInitializerMergerCollection
     99:104:void lambda$create$5(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.graph.ProgramMethod):94:99 -> a
     105:105:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder lambda$create$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.graph.DexProto):97:97 -> a
     106:107:void forEach(java.util.function.Consumer):122:123 -> a
-com.android.tools.r8.horizontalclassmerging.MergeGroup -> com.android.tools.r8.internal.d71:
+com.android.tools.r8.horizontalclassmerging.MergeGroup -> com.android.tools.r8.internal.g71:
     com.android.tools.r8.graph.DexField classIdField -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexProgramClass target -> c
@@ -66645,7 +66687,7 @@ com.android.tools.r8.horizontalclassmerging.MergeGroup -> com.android.tools.r8.i
     18:18:int com.android.tools.r8.graph.DexString.size():44:44 -> b
     18:18:void selectTarget(com.android.tools.r8.graph.AppView):185 -> b
     19:19:void selectTarget(com.android.tools.r8.graph.AppView):185:185 -> b
-    20:20:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():482:482 -> b
+    20:20:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():483:483 -> b
     20:20:void selectTarget(com.android.tools.r8.graph.AppView):189 -> b
     21:21:void selectTarget(com.android.tools.r8.graph.AppView):189:189 -> b
     22:23:void com.android.tools.r8.horizontalclassmerging.MergeGroup.setTarget(com.android.tools.r8.graph.DexProgramClass):193:194 -> b
@@ -66687,23 +66729,23 @@ com.android.tools.r8.horizontalclassmerging.MergeGroup -> com.android.tools.r8.i
     1:1:int size():227:227 -> size
     1:1:java.lang.Object[] toArray():260:260 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):265:265 -> toArray
-com.android.tools.r8.horizontalclassmerging.MultiClassPolicy -> com.android.tools.r8.internal.G81:
+com.android.tools.r8.horizontalclassmerging.MultiClassPolicy -> com.android.tools.r8.internal.J81:
     1:1:void <init>():9:9 -> <init>
     java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup) -> a
     com.android.tools.r8.horizontalclassmerging.MultiClassPolicy asMultiClassPolicy() -> a
     boolean isMultiClassPolicy() -> g
-com.android.tools.r8.horizontalclassmerging.MultiClassPolicyWithPreprocessing -> com.android.tools.r8.internal.H81:
+com.android.tools.r8.horizontalclassmerging.MultiClassPolicyWithPreprocessing -> com.android.tools.r8.internal.K81:
     1:1:void <init>():9:9 -> <init>
     java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.lang.Object) -> a
     com.android.tools.r8.horizontalclassmerging.MultiClassPolicyWithPreprocessing asMultiClassPolicyWithPreprocessing() -> b
     java.lang.Object preprocess(java.util.Collection) -> b
     boolean isMultiClassPolicyWithPreprocessing() -> h
-com.android.tools.r8.horizontalclassmerging.MultiClassSameReferencePolicy -> com.android.tools.r8.internal.I81:
+com.android.tools.r8.horizontalclassmerging.MultiClassSameReferencePolicy -> com.android.tools.r8.internal.L81:
     1:1:void <init>():12:12 -> <init>
     java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass) -> a
     1:9:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):16:24 -> a
     10:10:com.android.tools.r8.horizontalclassmerging.MergeGroup lambda$apply$0(java.lang.Object):20:20 -> a
-com.android.tools.r8.horizontalclassmerging.Policy -> com.android.tools.r8.internal.ye1:
+com.android.tools.r8.horizontalclassmerging.Policy -> com.android.tools.r8.internal.Be1:
     int numberOfRemovedInterfaces -> b
     boolean $assertionsDisabled -> c
     int numberOfRemovedClasses -> a
@@ -66724,7 +66766,7 @@ com.android.tools.r8.horizontalclassmerging.Policy -> com.android.tools.r8.inter
     boolean isMultiClassPolicyWithPreprocessing() -> h
     boolean isSingleClassPolicy() -> i
     boolean shouldSkipPolicy() -> j
-com.android.tools.r8.horizontalclassmerging.PolicyExecutor -> com.android.tools.r8.internal.ze1:
+com.android.tools.r8.horizontalclassmerging.PolicyExecutor -> com.android.tools.r8.internal.Ce1:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -66744,7 +66786,7 @@ com.android.tools.r8.horizontalclassmerging.PolicyExecutor -> com.android.tools.
     1:1:void lambda$applyMultiClassPolicyWithPreprocessing$3(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.MergeGroup):62:62 -> b
     2:2:void com.android.tools.r8.horizontalclassmerging.MergeGroup.applyMetadataFrom(com.android.tools.r8.horizontalclassmerging.MergeGroup):58:58 -> b
     2:2:void lambda$applyMultiClassPolicyWithPreprocessing$3(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.MergeGroup):62 -> b
-com.android.tools.r8.horizontalclassmerging.PolicyScheduler -> com.android.tools.r8.internal.Ae1:
+com.android.tools.r8.horizontalclassmerging.PolicyScheduler -> com.android.tools.r8.internal.De1:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():58:58 -> <clinit>
     1:1:java.util.List getPolicies(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):66:66 -> a
@@ -66785,12 +66827,12 @@ com.android.tools.r8.horizontalclassmerging.PolicyScheduler -> com.android.tools
     50:61:boolean verifySingleClassPoliciesIrrelevantForMergingSynthetics(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):133:144 -> a
     62:68:boolean verifyPolicyOrderingConstraints(java.util.List):231:237 -> a
     69:69:boolean lambda$verifyPolicyOrderingConstraints$0(com.android.tools.r8.horizontalclassmerging.Policy):233:233 -> a
-com.android.tools.r8.horizontalclassmerging.SingleClassPolicy -> com.android.tools.r8.internal.en1:
+com.android.tools.r8.horizontalclassmerging.SingleClassPolicy -> com.android.tools.r8.internal.Wm1:
     1:1:void <init>():9:9 -> <init>
     boolean canMerge(com.android.tools.r8.graph.DexProgramClass) -> a
     com.android.tools.r8.horizontalclassmerging.SingleClassPolicy asSingleClassPolicy() -> c
     boolean isSingleClassPolicy() -> i
-com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses -> com.android.tools.r8.internal.Ep1:
+com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses -> com.android.tools.r8.internal.wp1:
     java.util.Map subtypeMap -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Collection roots -> b
@@ -66812,13 +66854,13 @@ com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses -> com.an
     12:12:void lambda$traverseNodeDepthFirst$1(java.lang.Object,java.util.function.BiFunction,com.android.tools.r8.graph.DexProgramClass):74:74 -> a
     1:1:java.util.Collection getSubtypesFor(com.android.tools.r8.graph.DexProgramClass):68:68 -> b
     1:1:java.util.List lambda$calculateSubtyping$0(com.android.tools.r8.graph.DexProgramClass):59:59 -> c
-com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass -> com.android.tools.r8.internal.aq1:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass -> com.android.tools.r8.internal.Sp1:
     java.util.List syntheticClassTypes -> a
     1:1:void <init>(java.util.List,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$1):33:33 -> <init>
     2:3:void <init>(java.util.List):37:38 -> <init>
     1:1:java.util.List getArgumentClasses():42:42 -> a
-com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$1 -> com.android.tools.r8.internal.Yp1:
-com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$Builder -> com.android.tools.r8.internal.Zp1:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$1 -> com.android.tools.r8.internal.Qp1:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$Builder -> com.android.tools.r8.internal.Rp1:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():45:45 -> <clinit>
@@ -66831,7 +66873,7 @@ com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$Builder -> co
     10:13:com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass build(java.util.Collection):62:65 -> a
     14:17:com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass build(java.util.Collection):64:67 -> a
     18:20:com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass build(java.util.Collection):66:68 -> a
-com.android.tools.r8.horizontalclassmerging.TreeFixer -> com.android.tools.r8.internal.fr1:
+com.android.tools.r8.horizontalclassmerging.TreeFixer -> com.android.tools.r8.internal.Xq1:
     com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses mergedClasses -> g
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> h
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> i
@@ -66875,7 +66917,7 @@ com.android.tools.r8.horizontalclassmerging.TreeFixer -> com.android.tools.r8.in
     200:200:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.DexItemFactory.createFreshMember(java.util.function.Function,java.lang.String):2161:2161 -> a
     200:200:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):398 -> a
     201:211:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):398:408 -> a
-    212:212:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.DexField):337:337 -> a
+    212:212:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.DexField):303:303 -> a
     212:212:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):409 -> a
     213:215:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):409:411 -> a
     216:216:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):385:385 -> a
@@ -66905,7 +66947,7 @@ com.android.tools.r8.horizontalclassmerging.TreeFixer -> com.android.tools.r8.in
     3:3:void com.android.tools.r8.graph.DexClass.setInterfaces(com.android.tools.r8.graph.DexTypeList):173:173 -> c
     3:3:void fixupProgramClassSuperTypes(com.android.tools.r8.graph.DexProgramClass):149 -> c
     4:4:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupProgramClass$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):169:169 -> c
-com.android.tools.r8.horizontalclassmerging.VirtualMethodEntryPoint -> com.android.tools.r8.internal.ot1:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodEntryPoint -> com.android.tools.r8.internal.ht1:
     com.android.tools.r8.graph.DexMethod superMethod -> o
     boolean $assertionsDisabled -> p
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap mappedMethods -> m
@@ -66925,81 +66967,78 @@ com.android.tools.r8.horizontalclassmerging.VirtualMethodEntryPoint -> com.andro
     1:5:void handleReturn(int):101:105 -> i
     6:55:void prepareInstructions():111:160 -> i
     1:3:void addInvokeSuper():87:89 -> j
-com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger -> com.android.tools.r8.internal.rt1:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger -> com.android.tools.r8.internal.kt1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> c
     java.util.List methods -> d
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexMethod superMethod -> e
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.List,com.android.tools.r8.graph.DexMethod):45:50 -> <init>
-    1:7:com.android.tools.r8.graph.DexMethod moveMethod(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):103:109 -> a
-    8:22:com.android.tools.r8.graph.DexMethod moveMethod(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):105:119 -> a
-    23:29:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():123:129 -> a
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.List,com.android.tools.r8.graph.DexMethod):42:47 -> <init>
+    1:7:com.android.tools.r8.graph.DexMethod moveMethod(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):100:106 -> a
+    8:22:com.android.tools.r8.graph.DexMethod moveMethod(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):102:116 -> a
+    23:29:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():120:126 -> a
     30:30:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627:627 -> a
-    30:30:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():129 -> a
-    31:33:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():130:132 -> a
+    30:30:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():126 -> a
+    31:33:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():127:129 -> a
     34:34:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627:627 -> a
-    34:34:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():132 -> a
-    35:38:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():133:136 -> a
+    34:34:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():129 -> a
+    35:38:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():130:133 -> a
     39:39:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627:627 -> a
-    39:39:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():136 -> a
-    40:43:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():137:140 -> a
+    39:39:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():133 -> a
+    40:43:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():134:137 -> a
     44:44:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627:627 -> a
-    44:44:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():140 -> a
-    45:47:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():141:143 -> a
+    44:44:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():137 -> a
+    45:47:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():138:140 -> a
     48:48:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627:627 -> a
-    48:48:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():143 -> a
-    49:51:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():144:146 -> a
-    52:52:boolean lambda$getAccessFlags$0(com.android.tools.r8.graph.MethodAccessFlags):126:126 -> a
-    53:53:boolean lambda$isNop$6(com.android.tools.r8.graph.ProgramMethod):160:160 -> a
-    54:88:void mergeTrivial(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):190:224 -> a
-    89:89:void lambda$mergeTrivial$9(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):219:219 -> a
-    90:90:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIfKnown(com.android.tools.r8.utils.OptionalBool):1609:1609 -> a
-    90:90:void lambda$mergeTrivial$9(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):219 -> a
-    91:91:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIfKnown(com.android.tools.r8.utils.OptionalBool):1608:1608 -> a
-    91:91:void lambda$mergeTrivial$9(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):219 -> a
-    92:92:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):231:231 -> a
-    93:93:boolean com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger.isNopOrTrivial():181:181 -> a
-    93:93:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):234 -> a
-    94:111:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):235:252 -> a
+    48:48:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():140 -> a
+    49:51:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():141:143 -> a
+    52:52:boolean lambda$getAccessFlags$0(com.android.tools.r8.graph.MethodAccessFlags):123:123 -> a
+    53:53:boolean lambda$isNop$6(com.android.tools.r8.graph.ProgramMethod):157:157 -> a
+    54:88:void mergeTrivial(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):187:221 -> a
+    89:89:void lambda$mergeTrivial$9(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):216:216 -> a
+    90:90:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIfKnown(com.android.tools.r8.utils.OptionalBool):1555:1555 -> a
+    90:90:void lambda$mergeTrivial$9(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):216 -> a
+    91:91:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIfKnown(com.android.tools.r8.utils.OptionalBool):1554:1554 -> a
+    91:91:void lambda$mergeTrivial$9(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):216 -> a
+    92:92:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):228:228 -> a
+    93:93:boolean com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger.isNopOrTrivial():178:178 -> a
+    93:93:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):231 -> a
+    94:111:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):232:249 -> a
     112:112:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.recordNewMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):186:186 -> a
-    112:112:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):252 -> a
-    113:128:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):253:268 -> a
-    129:155:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):265:291 -> a
-    156:156:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):277:277 -> a
-    156:156:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):291 -> a
-    157:163:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):292:298 -> a
-    164:164:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.recordNewMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):186:186 -> a
-    164:164:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):302 -> a
-    165:165:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):304:304 -> a
-    1:1:boolean lambda$getAccessFlags$1(com.android.tools.r8.graph.MethodAccessFlags):129:129 -> b
-    2:2:com.android.tools.r8.graph.DexMethod getNewMethodReference():151:151 -> b
+    112:112:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):249 -> a
+    113:128:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):250:265 -> a
+    129:159:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):262:292 -> a
+    160:160:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.recordNewMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):186:186 -> a
+    160:160:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):296 -> a
+    161:161:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):298:298 -> a
+    1:1:boolean lambda$getAccessFlags$1(com.android.tools.r8.graph.MethodAccessFlags):126:126 -> b
+    2:2:com.android.tools.r8.graph.DexMethod getNewMethodReference():148:148 -> b
     3:3:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():679:679 -> b
     3:3:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):298 -> b
-    3:3:com.android.tools.r8.graph.DexMethod getNewMethodReference():151 -> b
+    3:3:com.android.tools.r8.graph.DexMethod getNewMethodReference():148 -> b
     4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):302:302 -> b
     4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):298 -> b
-    4:4:com.android.tools.r8.graph.DexMethod getNewMethodReference():151 -> b
-    5:5:boolean lambda$isTrivial$7(com.android.tools.r8.graph.ProgramMethod):176:176 -> b
-    1:1:boolean lambda$getAccessFlags$2(com.android.tools.r8.graph.MethodAccessFlags):132:132 -> c
-    2:3:boolean isNop():159:160 -> c
-    4:4:boolean lambda$mergeTrivial$8(com.android.tools.r8.graph.ProgramMethod):194:194 -> c
-    1:1:boolean lambda$getAccessFlags$3(com.android.tools.r8.graph.MethodAccessFlags):136:136 -> d
-    2:2:boolean isNopOrTrivial():181:181 -> d
-    1:1:boolean lambda$getAccessFlags$4(com.android.tools.r8.graph.MethodAccessFlags):140:140 -> e
-    2:9:boolean isTrivial():169:176 -> e
-    1:1:boolean lambda$getAccessFlags$5(com.android.tools.r8.graph.MethodAccessFlags):143:143 -> f
-com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder -> com.android.tools.r8.internal.qt1:
+    4:4:com.android.tools.r8.graph.DexMethod getNewMethodReference():148 -> b
+    5:5:boolean lambda$isTrivial$7(com.android.tools.r8.graph.ProgramMethod):173:173 -> b
+    1:1:boolean lambda$getAccessFlags$2(com.android.tools.r8.graph.MethodAccessFlags):129:129 -> c
+    2:3:boolean isNop():156:157 -> c
+    4:4:boolean lambda$mergeTrivial$8(com.android.tools.r8.graph.ProgramMethod):191:191 -> c
+    1:1:boolean lambda$getAccessFlags$3(com.android.tools.r8.graph.MethodAccessFlags):133:133 -> d
+    2:2:boolean isNopOrTrivial():178:178 -> d
+    1:1:boolean lambda$getAccessFlags$4(com.android.tools.r8.graph.MethodAccessFlags):137:137 -> e
+    2:9:boolean isTrivial():166:173 -> e
+    1:1:boolean lambda$getAccessFlags$5(com.android.tools.r8.graph.MethodAccessFlags):140:140 -> f
+com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder -> com.android.tools.r8.internal.jt1:
     java.util.List methods -> a
-    1:2:void <init>():53:54 -> <init>
-    1:1:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
-    2:2:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):89:89 -> a
-    3:21:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder.superMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):64:82 -> a
-    3:21:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):89 -> a
-    22:22:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):90:90 -> a
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger -> com.android.tools.r8.internal.zG0:
+    1:2:void <init>():50:51 -> <init>
+    1:1:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):54:54 -> a
+    2:2:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):86:86 -> a
+    3:21:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder.superMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):61:79 -> a
+    3:21:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):86 -> a
+    22:22:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):87:87 -> a
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger -> com.android.tools.r8.internal.CG0:
     com.android.tools.r8.com.google.common.collect.ImmutableList classInitializers -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():54:54 -> <clinit>
@@ -67014,21 +67053,21 @@ com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger -> com.a
     30:32:com.android.tools.r8.cf.CfVersion getCfVersion():98 -> a
     33:33:java.lang.Boolean lambda$getCfVersion$2(com.android.tools.r8.graph.ProgramMethod):97:97 -> a
     34:37:com.android.tools.r8.utils.AndroidApiLevel getApiReferenceLevel(com.android.tools.r8.graph.AppView):104:107 -> a
-    38:39:java.lang.Object com.android.tools.r8.utils.ListUtils.fold(java.util.Collection,java.lang.Object,java.util.function.BiFunction):222:223 -> a
+    38:39:java.lang.Object com.android.tools.r8.utils.ListUtils.fold(java.util.Collection,java.lang.Object,java.util.function.BiFunction):230:231 -> a
     38:39:com.android.tools.r8.utils.AndroidApiLevel getApiReferenceLevel(com.android.tools.r8.graph.AppView):105 -> a
     40:40:com.android.tools.r8.utils.AndroidApiLevel getApiReferenceLevel(com.android.tools.r8.graph.AppView):105:105 -> a
     41:41:com.android.tools.r8.utils.AndroidApiLevel lambda$getApiReferenceLevel$3(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.ProgramMethod):108:108 -> a
     1:1:boolean isEmpty():74:74 -> b
     2:2:java.lang.Boolean lambda$getCode$1(com.android.tools.r8.graph.ProgramMethod):83:83 -> b
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$1 -> com.android.tools.r8.internal.vG0:
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$Builder -> com.android.tools.r8.internal.wG0:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$1 -> com.android.tools.r8.internal.yG0:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$Builder -> com.android.tools.r8.internal.zG0:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder classInitializers -> a
     1:1:void <clinit>():111:111 -> <clinit>
     1:3:void <init>():111:113 -> <init>
     1:3:void add(com.android.tools.r8.graph.ProgramMethod):116:118 -> a
     4:4:com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger build():122:122 -> a
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$CfCodeBuilder -> com.android.tools.r8.internal.xG0:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$CfCodeBuilder -> com.android.tools.r8.internal.AG0:
     com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger this$0 -> c
     int maxLocals -> b
     int maxStack -> a
@@ -67045,7 +67084,7 @@ com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$CfCodeBu
     23:27:void lambda$buildInstructions$0(java.util.List,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):149 -> a
     28:43:void com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$CfCodeBuilder.addCfCode(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):165:180 -> a
     28:43:void lambda$buildInstructions$0(java.util.List,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):149 -> a
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$IRProvider -> com.android.tools.r8.internal.yG0:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$IRProvider -> com.android.tools.r8.internal.BG0:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexMethod syntheticMethodReference -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList classInitializers -> c
@@ -67069,18 +67108,20 @@ com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$IRProvid
     87:87:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):311:311 -> a
     1:1:boolean computeEquals(java.lang.Object):281:281 -> g
     1:1:java.lang.String toString():306:306 -> toString
-com.android.tools.r8.horizontalclassmerging.code.ConstructorEntryPointSynthesizedCode -> com.android.tools.r8.internal.JJ0:
+com.android.tools.r8.horizontalclassmerging.code.ConstructorEntryPointSynthesizedCode -> com.android.tools.r8.internal.MJ0:
     com.android.tools.r8.graph.DexField classIdField -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap typeConstructors -> f
+    boolean $assertionsDisabled -> g
     com.android.tools.r8.graph.DexMethod originalMethod -> d
     com.android.tools.r8.graph.DexMethod newConstructor -> c
+    1:1:void <clinit>():15:15 -> <clinit>
     1:5:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):25:29 -> <init>
     boolean isHorizontalClassMergingCode() -> V
     1:1:java.util.function.Consumer getRegistryCallback():41:41 -> X
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():34:34 -> Y
     1:1:com.android.tools.r8.ir.conversion.SourceCode lambda$getSourceCodeProvider$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):35:35 -> a
-    2:3:void registerReachableDefinitions(com.android.tools.r8.graph.UseRegistry):45:46 -> a
-com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter -> com.android.tools.r8.internal.hq1:
+    2:5:void registerReachableDefinitions(com.android.tools.r8.graph.UseRegistry):45:48 -> a
+com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter -> com.android.tools.r8.internal.Zp1:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List methods -> c
     com.android.tools.r8.horizontalclassmerging.IRCodeProvider codeProvider -> b
@@ -67088,14 +67129,14 @@ com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter -
     2:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,java.util.List):35:38 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider):43:43 -> a
     2:7:void convert(java.util.concurrent.ExecutorService):52:57 -> a
-    8:8:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):322:322 -> a
+    8:8:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):316:316 -> a
     8:8:void convert(java.util.concurrent.ExecutorService):57 -> a
     9:9:void convert(java.util.concurrent.ExecutorService):58:58 -> a
     10:12:void lambda$convert$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod):61:63 -> a
     13:13:void lambda$convert$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod):62:62 -> a
     14:14:boolean isEmpty():69:69 -> a
-com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$1 -> com.android.tools.r8.internal.fq1:
-com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder -> com.android.tools.r8.internal.gq1:
+com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$1 -> com.android.tools.r8.internal.Xp1:
+com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder -> com.android.tools.r8.internal.Yp1:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List methods -> c
     com.android.tools.r8.horizontalclassmerging.IRCodeProvider codeProvider -> b
@@ -67104,19 +67145,21 @@ com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$B
     3:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider):76:81 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder add(com.android.tools.r8.graph.ProgramMethod):85:85 -> a
     2:2:com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter build():90:90 -> a
-com.android.tools.r8.horizontalclassmerging.code.VirtualMethodEntryPointSynthesizedCode -> com.android.tools.r8.internal.pt1:
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap mappedMethods -> e
-    1:11:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):29:39 -> <init>
+com.android.tools.r8.horizontalclassmerging.code.VirtualMethodEntryPointSynthesizedCode -> com.android.tools.r8.internal.it1:
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap mappedMethods -> d
+    boolean $assertionsDisabled -> e
+    1:1:void <clinit>():17:17 -> <clinit>
+    1:10:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):27:36 -> <init>
     boolean isHorizontalClassMergingCode() -> V
-    1:1:java.util.function.Consumer getRegistryCallback():54:54 -> X
-    1:1:com.android.tools.r8.ir.conversion.SourceCode lambda$new$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):31:31 -> a
-    2:2:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.code.VirtualMethodEntryPointSynthesizedCode.computeSuperMethodTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):49:49 -> a
-    2:2:com.android.tools.r8.ir.conversion.SourceCode lambda$new$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):34 -> a
+    1:1:java.util.function.Consumer getRegistryCallback():51:51 -> X
+    1:1:com.android.tools.r8.ir.conversion.SourceCode lambda$new$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):29:29 -> a
+    2:2:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.code.VirtualMethodEntryPointSynthesizedCode.computeSuperMethodTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):46:46 -> a
+    2:2:com.android.tools.r8.ir.conversion.SourceCode lambda$new$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):32 -> a
     3:3:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):302:302 -> a
-    3:3:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.code.VirtualMethodEntryPointSynthesizedCode.computeSuperMethodTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):49 -> a
-    3:3:com.android.tools.r8.ir.conversion.SourceCode lambda$new$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):34 -> a
-    4:4:com.android.tools.r8.ir.conversion.SourceCode lambda$new$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):34:34 -> a
-    1:2:void registerReachableDefinitions(com.android.tools.r8.graph.UseRegistry):58:59 -> b
+    3:3:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.code.VirtualMethodEntryPointSynthesizedCode.computeSuperMethodTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):46 -> a
+    3:3:com.android.tools.r8.ir.conversion.SourceCode lambda$new$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):32 -> a
+    4:4:com.android.tools.r8.ir.conversion.SourceCode lambda$new$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):32:32 -> a
+    5:8:void registerReachableDefinitions(com.android.tools.r8.graph.UseRegistry):55:58 -> a
 com.android.tools.r8.horizontalclassmerging.policies.AllInstantiatedOrUninstantiated -> com.android.tools.r8.internal.w1:
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> e
@@ -67125,19 +67168,19 @@ com.android.tools.r8.horizontalclassmerging.policies.AllInstantiatedOrUninstanti
     1:1:java.lang.Boolean com.android.tools.r8.horizontalclassmerging.policies.AllInstantiatedOrUninstantiated.getMergeKey(com.android.tools.r8.graph.DexProgramClass):27:27 -> a
     1:1:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):13 -> a
     1:1:java.lang.String getName():32:32 -> e
-com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses -> com.android.tools.r8.internal.NF0:
+com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses -> com.android.tools.r8.internal.QF0:
     com.android.tools.r8.utils.InternalOptions options -> d
     1:2:void <init>(com.android.tools.r8.graph.AppView):23:24 -> <init>
     1:3:com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses.getMergeKey(com.android.tools.r8.graph.DexProgramClass):41:43 -> a
     1:3:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):14 -> a
     1:1:java.lang.String getName():29:29 -> e
     1:1:boolean shouldSkipPolicy():36:36 -> j
-com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification -> com.android.tools.r8.internal.MF0:
+com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification -> com.android.tools.r8.internal.PF0:
     com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification NOT_ABSTRACT -> b
     com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification ABSTRACT -> a
     1:2:void <clinit>():17:18 -> <clinit>
     1:1:void <init>(java.lang.String,int):16:16 -> <init>
-com.android.tools.r8.horizontalclassmerging.policies.CheckSyntheticClasses -> com.android.tools.r8.internal.bG0:
+com.android.tools.r8.horizontalclassmerging.policies.CheckSyntheticClasses -> com.android.tools.r8.internal.eG0:
     com.android.tools.r8.synthesis.SyntheticItems syntheticItems -> e
     com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions options -> d
     1:3:void <init>(com.android.tools.r8.graph.AppView):19:21 -> <init>
@@ -67148,7 +67191,7 @@ com.android.tools.r8.horizontalclassmerging.policies.CheckSyntheticClasses -> co
     4:4:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):298:298 -> a
     4:4:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):29 -> a
     1:1:java.lang.String getName():37:37 -> e
-com.android.tools.r8.horizontalclassmerging.policies.FinalizeMergeGroup -> com.android.tools.r8.internal.oP0:
+com.android.tools.r8.horizontalclassmerging.policies.FinalizeMergeGroup -> com.android.tools.r8.internal.rP0:
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> f
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> e
@@ -67161,7 +67204,7 @@ com.android.tools.r8.horizontalclassmerging.policies.FinalizeMergeGroup -> com.a
     18:19:void lambda$verifyAlreadyFinalized$2(java.util.Set,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):70:71 -> a
     1:9:boolean verifyAlreadyFinalized(com.android.tools.r8.horizontalclassmerging.MergeGroup):60:68 -> b
     1:1:java.lang.String getName():51:51 -> e
-com.android.tools.r8.horizontalclassmerging.policies.LimitClassGroups -> com.android.tools.r8.internal.M41:
+com.android.tools.r8.horizontalclassmerging.policies.LimitClassGroups -> com.android.tools.r8.internal.P41:
     boolean $assertionsDisabled -> e
     int maxGroupSize -> d
     1:1:void <clinit>():16:16 -> <clinit>
@@ -67176,7 +67219,7 @@ com.android.tools.r8.horizontalclassmerging.policies.LimitClassGroups -> com.and
     20:20:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):28:28 -> a
     1:1:java.lang.String getName():58:58 -> e
     boolean isIdentityForInterfaceGroups() -> f
-com.android.tools.r8.horizontalclassmerging.policies.MinimizeInstanceFieldCasts -> com.android.tools.r8.internal.W71:
+com.android.tools.r8.horizontalclassmerging.policies.MinimizeInstanceFieldCasts -> com.android.tools.r8.internal.Z71:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>():20:20 -> <init>
@@ -67188,12 +67231,12 @@ com.android.tools.r8.horizontalclassmerging.policies.MinimizeInstanceFieldCasts
     40:42:void addExact(com.android.tools.r8.graph.DexProgramClass,java.util.Map):63 -> a
     43:43:void addExact(com.android.tools.r8.graph.DexProgramClass,java.util.Map):63:63 -> a
     1:1:java.lang.String getName():76:76 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoAnnotationClasses -> com.android.tools.r8.internal.I91:
+com.android.tools.r8.horizontalclassmerging.policies.NoAnnotationClasses -> com.android.tools.r8.internal.L91:
     1:1:void <init>():10:10 -> <init>
     1:1:boolean com.android.tools.r8.graph.DexClass.isAnnotation():651:651 -> a
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):13 -> a
     1:1:java.lang.String getName():18:18 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoClassAnnotationCollisions -> com.android.tools.r8.internal.J91:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassAnnotationCollisions -> com.android.tools.r8.internal.M91:
     1:1:void com.android.tools.r8.horizontalclassmerging.policies.AtMostOneClassThatMatchesPolicy.<init>():18:18 -> <init>
     1:1:void <init>():9 -> <init>
     1:2:java.util.Collection com.android.tools.r8.horizontalclassmerging.policies.AtMostOneClassThatMatchesPolicy.apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):23:24 -> a
@@ -67221,13 +67264,13 @@ com.android.tools.r8.horizontalclassmerging.policies.NoClassAnnotationCollisions
     21:24:java.util.Collection com.android.tools.r8.horizontalclassmerging.policies.AtMostOneClassThatMatchesPolicy.apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:java.lang.String getName():18:18 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerWithObservableSideEffects -> com.android.tools.r8.internal.K91:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerWithObservableSideEffects -> com.android.tools.r8.internal.N91:
     1:1:void <init>():16:16 -> <init>
     1:5:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):20:24 -> a
     6:7:boolean com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerWithObservableSideEffects.isKotlinLambda(com.android.tools.r8.graph.DexProgramClass):28:29 -> a
     6:7:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):24 -> a
     1:1:java.lang.String getName():34:34 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoConstructorCollisions -> com.android.tools.r8.internal.L91:
+com.android.tools.r8.horizontalclassmerging.policies.NoConstructorCollisions -> com.android.tools.r8.internal.O91:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> e
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> f
@@ -67251,7 +67294,7 @@ com.android.tools.r8.horizontalclassmerging.policies.NoConstructorCollisions ->
     26:30:java.util.Set preprocess(java.util.Collection):95 -> c
     31:41:java.util.Set preprocess(java.util.Collection):96:106 -> c
     1:1:java.lang.String getName():148:148 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoDeadEnumLiteMaps -> com.android.tools.r8.internal.M91:
+com.android.tools.r8.horizontalclassmerging.policies.NoDeadEnumLiteMaps -> com.android.tools.r8.internal.P91:
     java.util.Set deadEnumLiteMaps -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():17:17 -> <clinit>
@@ -67259,7 +67302,7 @@ com.android.tools.r8.horizontalclassmerging.policies.NoDeadEnumLiteMaps -> com.a
     8:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):26:26 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):32:32 -> a
     1:1:java.lang.String getName():37:37 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoDeadLocks -> com.android.tools.r8.internal.N91:
+com.android.tools.r8.horizontalclassmerging.policies.NoDeadLocks -> com.android.tools.r8.internal.Q91:
     com.android.tools.r8.graph.AppView appView -> d
     1:2:void <init>(com.android.tools.r8.graph.AppView):20:21 -> <init>
     1:1:boolean com.android.tools.r8.horizontalclassmerging.policies.NoDeadLocks.isSynchronizationClass(com.android.tools.r8.graph.DexProgramClass):25:25 -> a
@@ -67267,7 +67310,7 @@ com.android.tools.r8.horizontalclassmerging.policies.NoDeadLocks -> com.android.
     2:4:boolean lambda$apply$0(java.util.Collection,com.android.tools.r8.graph.DexProgramClass):36:38 -> a
     5:29:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):31:55 -> a
     1:1:java.lang.String getName():62:62 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCollisions -> com.android.tools.r8.internal.P91:
+com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCollisions -> com.android.tools.r8.internal.S91:
     com.android.tools.r8.graph.AppView appView -> d
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> e
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):78:80 -> <init>
@@ -67322,13 +67365,13 @@ com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCol
     1:1:boolean lambda$computeInheritedDefaultMethodsPerProgramType$6(com.android.tools.r8.graph.DexType):263:263 -> d
     1:1:java.lang.String getName():347:347 -> e
     1:1:boolean shouldSkipPolicy():352:352 -> j
-com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCollisions$InterfaceInfo -> com.android.tools.r8.internal.O91:
+com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCollisions$InterfaceInfo -> com.android.tools.r8.internal.R91:
     java.util.Map inheritedDefaultMethods -> a
     java.util.Map defaultMethodsInheritedBySubclasses -> b
     1:3:void <init>(java.util.Map,java.util.Map):367:369 -> <init>
     1:1:java.util.Map getDefaultMethodsInheritedBySubclasses():377:377 -> a
     1:1:java.util.Map getInheritedDefaultMethods():373:373 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodMerging -> com.android.tools.r8.internal.Q91:
+com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodMerging -> com.android.tools.r8.internal.T91:
     com.android.tools.r8.utils.InternalOptions options -> e
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> d
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):35:37 -> <init>
@@ -67345,7 +67388,7 @@ com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodMer
     33:33:void addClassToGroup(com.android.tools.r8.graph.DexProgramClass,java.util.Map):72:72 -> a
     1:1:java.lang.String getName():77:77 -> e
     1:1:boolean shouldSkipPolicy():82:82 -> j
-com.android.tools.r8.horizontalclassmerging.policies.NoDifferentApiReferenceLevel -> com.android.tools.r8.internal.R91:
+com.android.tools.r8.horizontalclassmerging.policies.NoDifferentApiReferenceLevel -> com.android.tools.r8.internal.U91:
     com.android.tools.r8.graph.AppView appView -> e
     boolean enableApiCallerIdentification -> f
     com.android.tools.r8.androidapi.AndroidApiReferenceLevelCache apiReferenceLevelCache -> d
@@ -67356,7 +67399,7 @@ com.android.tools.r8.horizontalclassmerging.policies.NoDifferentApiReferenceLeve
     1:2:com.android.tools.r8.utils.AndroidApiLevel getMergeKey(com.android.tools.r8.graph.DexProgramClass):39:40 -> b
     1:1:java.lang.String getName():34:34 -> e
     1:1:boolean shouldSkipPolicy():29:29 -> j
-com.android.tools.r8.horizontalclassmerging.policies.NoDirectRuntimeTypeChecks -> com.android.tools.r8.internal.S91:
+com.android.tools.r8.horizontalclassmerging.policies.NoDirectRuntimeTypeChecks -> com.android.tools.r8.internal.V91:
     com.android.tools.r8.synthesis.SyntheticItems syntheticItems -> f
     com.android.tools.r8.utils.InternalOptions options -> d
     boolean $assertionsDisabled -> g
@@ -67369,7 +67412,7 @@ com.android.tools.r8.horizontalclassmerging.policies.NoDirectRuntimeTypeChecks -
     4:8:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):36:40 -> a
     1:1:java.lang.String getName():45:45 -> e
     1:1:boolean shouldSkipPolicy():50:50 -> j
-com.android.tools.r8.horizontalclassmerging.policies.NoEnums -> com.android.tools.r8.internal.T91:
+com.android.tools.r8.horizontalclassmerging.policies.NoEnums -> com.android.tools.r8.internal.W91:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap cache -> e
     com.android.tools.r8.graph.AppView appView -> d
     1:1:void <init>(com.android.tools.r8.graph.AppView):20:20 -> <init>
@@ -67378,12 +67421,12 @@ com.android.tools.r8.horizontalclassmerging.policies.NoEnums -> com.android.tool
     5:17:boolean isEnumSubtype(com.android.tools.r8.graph.DexClass):46:58 -> a
     1:1:void clear():26:26 -> d
     1:1:java.lang.String getName():31:31 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoFailedResolutionTargets -> com.android.tools.r8.internal.U91:
+com.android.tools.r8.horizontalclassmerging.policies.NoFailedResolutionTargets -> com.android.tools.r8.internal.X91:
     java.util.Set failedResolutionHolders -> d
     1:4:void <init>(com.android.tools.r8.graph.AppView):21:24 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):35:35 -> a
     1:1:java.lang.String getName():30:30 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoIllegalInlining -> com.android.tools.r8.internal.V91:
+com.android.tools.r8.horizontalclassmerging.policies.NoIllegalInlining -> com.android.tools.r8.internal.Y91:
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():18:18 -> <clinit>
@@ -67395,7 +67438,7 @@ com.android.tools.r8.horizontalclassmerging.policies.NoIllegalInlining -> com.an
     4:19:boolean com.android.tools.r8.horizontalclassmerging.policies.NoIllegalInlining.disallowInlining(com.android.tools.r8.graph.ProgramMethod):30:45 -> a
     4:19:boolean lambda$canMerge$0(com.android.tools.r8.graph.ProgramMethod):56 -> a
     1:1:java.lang.String getName():61:61 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoIndirectRuntimeTypeChecks -> com.android.tools.r8.internal.W91:
+com.android.tools.r8.horizontalclassmerging.policies.NoIndirectRuntimeTypeChecks -> com.android.tools.r8.internal.Z91:
     com.android.tools.r8.graph.AppView appView -> d
     com.android.tools.r8.shaking.RuntimeTypeCheckInfo runtimeTypeCheckInfo -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap cache -> f
@@ -67414,15 +67457,15 @@ com.android.tools.r8.horizontalclassmerging.policies.NoIndirectRuntimeTypeChecks
     6:12:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.getSorted():162:168 -> b
     6:12:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):40 -> b
     1:1:java.lang.String getName():73:73 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoInnerClasses -> com.android.tools.r8.internal.X91:
+com.android.tools.r8.horizontalclassmerging.policies.NoInnerClasses -> com.android.tools.r8.internal.aa1:
     1:1:void <init>():10:10 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):15:15 -> a
     1:1:java.lang.String getName():20:20 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoInstanceFieldAnnotations -> com.android.tools.r8.internal.Y91:
+com.android.tools.r8.horizontalclassmerging.policies.NoInstanceFieldAnnotations -> com.android.tools.r8.internal.ba1:
     1:1:void <init>():11:11 -> <init>
     1:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):15:16 -> a
     1:1:java.lang.String getName():25:25 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoInstanceInitializerMerging -> com.android.tools.r8.internal.Z91:
+com.android.tools.r8.horizontalclassmerging.policies.NoInstanceInitializerMerging -> com.android.tools.r8.internal.ca1:
     com.android.tools.r8.graph.AppView appView -> d
     com.android.tools.r8.horizontalclassmerging.IRCodeProvider codeProvider -> e
     boolean $assertionsDisabled -> f
@@ -67440,7 +67483,7 @@ com.android.tools.r8.horizontalclassmerging.policies.NoInstanceInitializerMergin
     78:84:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):124:130 -> a
     85:85:java.util.Optional lambda$apply$0(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):100:100 -> a
     86:98:boolean hasMultipleInstanceInitializersWithSameRelaxedSignature(com.android.tools.r8.graph.DexProgramClass):164:176 -> a
-    99:100:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):33:34 -> a
+    99:100:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):38:39 -> a
     99:100:boolean hasMultipleInstanceInitializersWithSameRelaxedSignature(com.android.tools.r8.graph.DexProgramClass):176 -> a
     101:101:boolean hasMultipleInstanceInitializersWithSameRelaxedSignature(com.android.tools.r8.graph.DexProgramClass):177:177 -> a
     102:102:boolean lambda$hasMultipleInstanceInitializersWithSameRelaxedSignature$1(java.util.Set,com.android.tools.r8.graph.ProgramMethod):179:179 -> a
@@ -67461,14 +67504,14 @@ com.android.tools.r8.horizontalclassmerging.policies.NoInstanceInitializerMergin
     159:163:void lambda$setInstanceFieldMaps$4(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Map,com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap,com.android.tools.r8.graph.ProgramField):245:249 -> a
     1:1:java.lang.String getName():257:257 -> e
     boolean isIdentityForInterfaceGroups() -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoInterfaces -> com.android.tools.r8.internal.aa1:
+com.android.tools.r8.horizontalclassmerging.policies.NoInterfaces -> com.android.tools.r8.internal.da1:
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> d
     com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions options -> e
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):19:21 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):26:26 -> a
     1:1:java.lang.String getName():36:36 -> e
     1:1:boolean shouldSkipPolicy():31:31 -> j
-com.android.tools.r8.horizontalclassmerging.policies.NoKeepRules -> com.android.tools.r8.internal.ba1:
+com.android.tools.r8.horizontalclassmerging.policies.NoKeepRules -> com.android.tools.r8.internal.ea1:
     java.util.Set dontMergeTypes -> g
     com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> e
     com.android.tools.r8.graph.AppView appView -> d
@@ -67480,7 +67523,7 @@ com.android.tools.r8.horizontalclassmerging.policies.NoKeepRules -> com.android.
     10:10:void processClass(com.android.tools.r8.graph.DexProgramClass):42:42 -> b
     11:19:void processClass(com.android.tools.r8.graph.DexProgramClass):40:48 -> b
     1:1:java.lang.String getName():59:59 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoKotlinMetadata -> com.android.tools.r8.internal.ca1:
+com.android.tools.r8.horizontalclassmerging.policies.NoKotlinMetadata -> com.android.tools.r8.internal.fa1:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -67490,26 +67533,26 @@ com.android.tools.r8.horizontalclassmerging.policies.NoKotlinMetadata -> com.and
     4:4:boolean lambda$verifyNoUnexpectedKotlinMemberInfo$0(com.android.tools.r8.graph.DexEncodedMember):29:29 -> a
     1:3:boolean verifyNoUnexpectedKotlinMemberInfo(com.android.tools.r8.graph.DexProgramClass):28:28 -> b
     1:1:java.lang.String getName():35:35 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoNativeMethods -> com.android.tools.r8.internal.da1:
+com.android.tools.r8.horizontalclassmerging.policies.NoNativeMethods -> com.android.tools.r8.internal.ga1:
     1:1:void <init>():12:12 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):15:15 -> a
     2:2:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627:627 -> a
     2:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):15 -> a
     1:1:java.lang.String getName():20:20 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoServiceLoaders -> com.android.tools.r8.internal.ea1:
+com.android.tools.r8.horizontalclassmerging.policies.NoServiceLoaders -> com.android.tools.r8.internal.ha1:
     com.android.tools.r8.graph.AppView appView -> d
     java.util.Set allServiceImplementations -> e
     1:3:void <init>(com.android.tools.r8.graph.AppView):18:20 -> <init>
     1:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):25:26 -> a
     1:1:java.lang.String getName():31:31 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoVerticallyMergedClasses -> com.android.tools.r8.internal.fa1:
+com.android.tools.r8.horizontalclassmerging.policies.NoVerticallyMergedClasses -> com.android.tools.r8.internal.ia1:
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():13:13 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):16:20 -> <init>
     1:4:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):25:28 -> a
     1:1:java.lang.String getName():33:33 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoVirtualMethodMerging -> com.android.tools.r8.internal.ga1:
+com.android.tools.r8.horizontalclassmerging.policies.NoVirtualMethodMerging -> com.android.tools.r8.internal.ja1:
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():33:33 -> <clinit>
@@ -67533,12 +67576,12 @@ com.android.tools.r8.horizontalclassmerging.policies.NoVirtualMethodMerging -> c
     52:52:boolean hasNonAbstractDefinitionInSuperInterface(java.lang.Iterable,com.android.tools.r8.graph.ProgramMethod):118 -> a
     53:58:boolean lambda$hasNonAbstractDefinitionInSuperInterface$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):121:126 -> a
     1:1:java.lang.String getName():132:132 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NotMatchedByNoHorizontalClassMerging -> com.android.tools.r8.internal.Aa1:
+com.android.tools.r8.horizontalclassmerging.policies.NotMatchedByNoHorizontalClassMerging -> com.android.tools.r8.internal.Da1:
     com.android.tools.r8.graph.AppView appView -> d
     1:2:void <init>(com.android.tools.r8.graph.AppView):16:17 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):22:22 -> a
     1:1:java.lang.String getName():27:27 -> e
-com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces -> com.android.tools.r8.internal.pd1:
+com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces -> com.android.tools.r8.internal.sd1:
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> g
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> e
@@ -67558,7 +67601,7 @@ com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnre
     1:1:void clear():154:154 -> d
     1:1:java.lang.String getName():159:159 -> e
     1:1:boolean shouldSkipPolicy():169:169 -> j
-com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces$MergeGroupWithInfo -> com.android.tools.r8.internal.od1:
+com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces$MergeGroupWithInfo -> com.android.tools.r8.internal.rd1:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> a
     java.util.Set superInterfaces -> c
     java.util.Set subInterfaces -> d
@@ -67571,7 +67614,7 @@ com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnre
     19:19:com.android.tools.r8.horizontalclassmerging.MergeGroup getGroup():207:207 -> a
     1:1:boolean lambda$add$1(com.android.tools.r8.graph.DexProgramClass):202:202 -> b
     2:19:boolean isSafeToAddSubAndSuperInterfaces(com.android.tools.r8.graph.DexProgramClass,java.util.Set,java.util.Set):215:232 -> b
-com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics -> com.android.tools.r8.internal.We1:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics -> com.android.tools.r8.internal.Ze1:
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():30:30 -> <clinit>
@@ -67582,7 +67625,7 @@ com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristi
     6:16:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):145:155 -> a
     17:17:boolean lambda$apply$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$TargetGroup):143:143 -> a
     1:1:java.lang.String getName():34:34 -> e
-com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics -> com.android.tools.r8.internal.Ue1:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics -> com.android.tools.r8.internal.Xe1:
     com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride -> c
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> a
     boolean isAssumeNoSideEffectsMethod -> b
@@ -67594,14 +67637,14 @@ com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristi
     5:5:com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):64:64 -> a
     1:5:boolean equals(java.lang.Object):81:85 -> equals
     1:6:int hashCode():69:69 -> hashCode
-com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$TargetGroup -> com.android.tools.r8.internal.Ve1:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$TargetGroup -> com.android.tools.r8.internal.Ye1:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> a
     java.util.Map methodMap -> b
     1:4:void <init>():101:104 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.MergeGroup getGroup():107:107 -> a
     2:16:boolean tryAdd(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):111:125 -> a
     17:17:boolean isSubjectToMethodMerging(com.android.tools.r8.graph.DexEncodedMethod):130:130 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions -> com.android.tools.r8.internal.ff1:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions -> com.android.tools.r8.internal.if1:
     com.android.tools.r8.graph.AppView appView -> d
     com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses subtypingForrestForClasses -> e
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$InterfaceDefaultSignaturesCache interfaceDefaultMethodsCache -> f
@@ -67627,31 +67670,31 @@ com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaul
     1:1:com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$InterfaceDefaultSignaturesCache access$600(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions):52:52 -> b
     1:1:com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses access$700(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions):52:52 -> c
     1:1:java.lang.String getName():66:66 -> e
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$1 -> com.android.tools.r8.internal.Xe1:
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DexClassSignaturesCache -> com.android.tools.r8.internal.Ye1:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$1 -> com.android.tools.r8.internal.af1:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DexClassSignaturesCache -> com.android.tools.r8.internal.bf1:
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions this$0 -> b
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions):85:85 -> <init>
     2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions,com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$1):85:85 -> <init>
     1:2:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeSignatures(com.android.tools.r8.graph.DexType):88:89 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DispatchSignature -> com.android.tools.r8.internal.Ze1:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DispatchSignature -> com.android.tools.r8.internal.cf1:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():139:139 -> <clinit>
     1:1:void <init>():139:139 -> <init>
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$InterfaceDefaultSignaturesCache -> com.android.tools.r8.internal.af1:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$InterfaceDefaultSignaturesCache -> com.android.tools.r8.internal.df1:
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions):93:93 -> <init>
     2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions,com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$1):93:93 -> <init>
     1:2:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):97:98 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$MethodCategory -> com.android.tools.r8.internal.bf1:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$MethodCategory -> com.android.tools.r8.internal.ef1:
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$MethodCategory KEEP_ABSENT -> b
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$MethodCategory CLASS_HIERARCHY_SAFE -> a
     1:2:void <clinit>():135:136 -> <clinit>
     1:1:void <init>(java.lang.String,int):134:134 -> <init>
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ParentClassSignaturesCache -> com.android.tools.r8.internal.cf1:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ParentClassSignaturesCache -> com.android.tools.r8.internal.ff1:
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions this$0 -> c
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions):102:102 -> <init>
     2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions,com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$1):102:102 -> <init>
     1:5:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):106:110 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ReservedInterfaceSignaturesFor -> com.android.tools.r8.internal.df1:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ReservedInterfaceSignaturesFor -> com.android.tools.r8.internal.gf1:
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions this$0 -> b
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions):116:116 -> <init>
     2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions,com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$1):116:116 -> <init>
@@ -67659,14 +67702,14 @@ com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaul
     2:2:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):121:121 -> a
     3:6:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):120:123 -> a
     7:9:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):122:124 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$SignaturesCache -> com.android.tools.r8.internal.ef1:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$SignaturesCache -> com.android.tools.r8.internal.hf1:
     java.util.Map memoizedSignatures -> a
     1:2:void <init>():69:70 -> <init>
     3:3:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$1):69:69 -> <init>
     void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet) -> a
     1:1:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeSignatures(com.android.tools.r8.graph.DexClass):73:73 -> a
     2:3:com.android.tools.r8.utils.collections.DexMethodSignatureSet lambda$getOrComputeSignatures$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):76:77 -> a
-com.android.tools.r8.horizontalclassmerging.policies.RespectPackageBoundaries -> com.android.tools.r8.internal.tl1:
+com.android.tools.r8.horizontalclassmerging.policies.RespectPackageBoundaries -> com.android.tools.r8.internal.rl1:
     com.android.tools.r8.graph.AppView appView -> d
     1:2:void <init>(com.android.tools.r8.graph.AppView):28:29 -> <init>
     1:6:com.android.tools.r8.utils.TraversalContinuation lambda$shouldRestrictMergingAcrossPackageBoundary$0(com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector,com.android.tools.r8.graph.ProgramMethod):72:77 -> a
@@ -67684,7 +67727,7 @@ com.android.tools.r8.horizontalclassmerging.policies.RespectPackageBoundaries ->
     43:43:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):52 -> a
     44:64:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):59:79 -> a
     1:1:java.lang.String getName():127:127 -> e
-com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit -> com.android.tools.r8.internal.rm1:
+com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit -> com.android.tools.r8.internal.jm1:
     com.android.tools.r8.graph.AppView appView -> d
     1:2:void <init>(com.android.tools.r8.graph.AppView):16:17 -> <init>
     1:4:com.android.tools.r8.FeatureSplit com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit.getMergeKey(com.android.tools.r8.graph.DexProgramClass):22:25 -> a
@@ -67693,7 +67736,7 @@ com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit -> com.and
     5:5:com.android.tools.r8.FeatureSplit com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit.getMergeKey(com.android.tools.r8.graph.DexProgramClass):25 -> a
     5:5:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):13 -> a
     1:1:java.lang.String getName():30:30 -> e
-com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields -> com.android.tools.r8.internal.tm1:
+com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields -> com.android.tools.r8.internal.lm1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> e
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):26:28 -> <init>
@@ -67704,7 +67747,7 @@ com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields -> com.a
     9:9:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields.getMergeKey(com.android.tools.r8.graph.DexProgramClass):41 -> a
     9:9:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):21 -> a
     1:1:java.lang.String getName():48:48 -> e
-com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo -> com.android.tools.r8.internal.sm1:
+com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo -> com.android.tools.r8.internal.km1:
     com.android.tools.r8.graph.DexType type -> b
     com.android.tools.r8.graph.FieldAccessFlags accessFlags -> a
     1:6:void <init>(com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.DexType):56:61 -> <init>
@@ -67713,25 +67756,25 @@ com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$Instance
     5:6:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo toInfoWithRelaxedType(com.android.tools.r8.graph.DexItemFactory):80:81 -> a
     1:5:boolean equals(java.lang.Object):86:90 -> equals
     1:1:int hashCode():95:95 -> hashCode
-com.android.tools.r8.horizontalclassmerging.policies.SameMainDexGroup -> com.android.tools.r8.internal.um1:
+com.android.tools.r8.horizontalclassmerging.policies.SameMainDexGroup -> com.android.tools.r8.internal.mm1:
     com.android.tools.r8.shaking.MainDexInfo mainDexInfo -> d
     com.android.tools.r8.synthesis.SyntheticItems synthetics -> e
     1:3:void <init>(com.android.tools.r8.graph.AppView):20:22 -> <init>
     1:2:com.android.tools.r8.shaking.MainDexInfo$MainDexGroup com.android.tools.r8.horizontalclassmerging.policies.SameMainDexGroup.getMergeKey(com.android.tools.r8.graph.DexProgramClass):27:28 -> a
     1:2:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):15 -> a
     1:1:java.lang.String getName():34:34 -> e
-com.android.tools.r8.horizontalclassmerging.policies.SameNestHost -> com.android.tools.r8.internal.vm1:
+com.android.tools.r8.horizontalclassmerging.policies.SameNestHost -> com.android.tools.r8.internal.nm1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
     1:2:void <init>(com.android.tools.r8.graph.AppView):18:19 -> <init>
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.horizontalclassmerging.policies.SameNestHost.getMergeKey(com.android.tools.r8.graph.DexProgramClass):24:24 -> a
     1:1:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):14 -> a
     1:1:java.lang.String getName():29:29 -> e
-com.android.tools.r8.horizontalclassmerging.policies.SameParentClass -> com.android.tools.r8.internal.wm1:
+com.android.tools.r8.horizontalclassmerging.policies.SameParentClass -> com.android.tools.r8.internal.om1:
     1:1:void <init>():11:11 -> <init>
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.horizontalclassmerging.policies.SameParentClass.getMergeKey(com.android.tools.r8.graph.DexProgramClass):15:15 -> a
     1:1:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):11 -> a
     1:1:java.lang.String getName():20:20 -> e
-com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy -> com.android.tools.r8.internal.kq1:
+com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy -> com.android.tools.r8.internal.cq1:
     com.android.tools.r8.synthesis.SyntheticItems syntheticItems -> e
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> d
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):25:27 -> <init>
@@ -67743,12 +67786,12 @@ com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy -> com
     3:7:com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy.getMergeKey(com.android.tools.r8.graph.DexProgramClass):34:38 -> a
     3:7:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):15 -> a
     1:1:java.lang.String getName():43:43 -> e
-com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind -> com.android.tools.r8.internal.jq1:
+com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind -> com.android.tools.r8.internal.bq1:
     com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind NOT_SYNTHETIC -> b
     com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind SYNTHETIC -> a
     1:2:void <clinit>():18:19 -> <clinit>
     1:1:void <init>(java.lang.String,int):17:17 -> <init>
-com.android.tools.r8.horizontalclassmerging.policies.VerifyPolicyAlwaysSatisfied -> com.android.tools.r8.internal.Ps1:
+com.android.tools.r8.horizontalclassmerging.policies.VerifyPolicyAlwaysSatisfied -> com.android.tools.r8.internal.Is1:
     com.android.tools.r8.horizontalclassmerging.SingleClassPolicy policy -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():10:10 -> <clinit>
@@ -67756,7 +67799,7 @@ com.android.tools.r8.horizontalclassmerging.policies.VerifyPolicyAlwaysSatisfied
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):20:20 -> a
     1:1:java.lang.String getName():26:26 -> e
     1:1:boolean shouldSkipPolicy():31:31 -> j
-com.android.tools.r8.inspector.internal.ClassInspectorImpl -> com.android.tools.r8.internal.IG0:
+com.android.tools.r8.inspector.internal.ClassInspectorImpl -> com.android.tools.r8.internal.LG0:
     com.android.tools.r8.graph.DexClass clazz -> a
     com.android.tools.r8.references.ClassReference reference -> b
     1:1:void <init>(com.android.tools.r8.graph.DexClass):19:19 -> <init>
@@ -67766,7 +67809,7 @@ com.android.tools.r8.inspector.internal.ClassInspectorImpl -> com.android.tools.
     1:1:void forEachField(java.util.function.Consumer):33:33 -> forEachField
     1:1:void forEachMethod(java.util.function.Consumer):38:38 -> forEachMethod
     1:4:com.android.tools.r8.references.ClassReference getClassReference():25:28 -> getClassReference
-com.android.tools.r8.inspector.internal.FieldInspectorImpl -> com.android.tools.r8.internal.SO0:
+com.android.tools.r8.inspector.internal.FieldInspectorImpl -> com.android.tools.r8.internal.VO0:
     com.android.tools.r8.graph.DexEncodedField field -> b
     com.android.tools.r8.inspector.internal.ClassInspectorImpl parent -> a
     com.android.tools.r8.references.FieldReference reference -> c
@@ -67775,19 +67818,19 @@ com.android.tools.r8.inspector.internal.FieldInspectorImpl -> com.android.tools.
     1:6:com.android.tools.r8.references.FieldReference getFieldReference():25:30 -> getFieldReference
     7:12:com.android.tools.r8.references.FieldReference getFieldReference():27:32 -> getFieldReference
     1:1:java.util.Optional getInitialValue():47:47 -> getInitialValue
-    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> getInitialValue
+    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> getInitialValue
     2:2:java.util.Optional getInitialValue():47 -> getInitialValue
     3:6:java.util.Optional getInitialValue():47:50 -> getInitialValue
     1:1:boolean isFinal():42:42 -> isFinal
     1:1:boolean isStatic():37:37 -> isStatic
-com.android.tools.r8.inspector.internal.InspectorImpl -> com.android.tools.r8.internal.VT0:
+com.android.tools.r8.inspector.internal.InspectorImpl -> com.android.tools.r8.internal.YT0:
     java.util.Collection classes -> a
     1:2:void <init>(java.util.Collection):43:44 -> <init>
     1:6:java.util.List wrapInspections(java.util.Collection):20:25 -> a
     7:7:java.util.List wrapInspections(java.util.Collection):21:21 -> a
     8:13:void runInspections(java.util.List,java.util.Collection):32:37 -> a
     1:2:void forEachClass(java.util.function.Consumer):49:50 -> forEachClass
-com.android.tools.r8.inspector.internal.MethodInspectorImpl -> com.android.tools.r8.internal.D71:
+com.android.tools.r8.inspector.internal.MethodInspectorImpl -> com.android.tools.r8.internal.G71:
     com.android.tools.r8.inspector.internal.ClassInspectorImpl parent -> a
     com.android.tools.r8.references.MethodReference reference -> c
     com.android.tools.r8.graph.DexEncodedMethod method -> b
@@ -67797,7 +67840,7 @@ com.android.tools.r8.inspector.internal.MethodInspectorImpl -> com.android.tools
     8:14:com.android.tools.r8.references.MethodReference getMethodReference():31:37 -> getMethodReference
     15:15:com.android.tools.r8.references.MethodReference getMethodReference():36:36 -> getMethodReference
     16:27:com.android.tools.r8.references.MethodReference getMethodReference():28:39 -> getMethodReference
-com.android.tools.r8.inspector.internal.ValueInspectorImpl -> com.android.tools.r8.internal.Hs1:
+com.android.tools.r8.inspector.internal.ValueInspectorImpl -> com.android.tools.r8.internal.As1:
     com.android.tools.r8.graph.DexValue value -> a
     com.android.tools.r8.graph.DexType type -> b
     1:3:void <init>(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType):34:36 -> <init>
@@ -67883,72 +67926,72 @@ com.android.tools.r8.internal.ArchiveProgramResourceProvider$$ExternalSyntheticO
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.StringBuilder com.android.tools.r8.ArchiveProgramResourceProvider$$InternalSyntheticOutline$164$331ec4b20fed4c00c265d661f66f3bc6dab3c078539ed58a91edf4cee800bec9$0.m(java.lang.String) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.internal.AvailableApiExceptions$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.DA0:
+com.android.tools.r8.internal.AvailableApiExceptions$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.GA0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     void com.android.tools.r8.androidapi.AvailableApiExceptions$$InternalSyntheticOutline$164$2a5c9406dafedb48c5a7e79f61bd9fd84e9b1971bbc82043c45124ac22b75952$0.m(com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.util.Set,java.lang.String,java.lang.String) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.internal.BackportedMethodListCommand$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.FA0:
+com.android.tools.r8.internal.BackportedMethodListCommand$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.IA0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String com.android.tools.r8.BackportedMethodListCommand$$InternalSyntheticOutline$164$523a7db4d0f930606115e4403e69302eb5a112e13ae2b386ed56b04a73979aad$0.m(java.lang.StringBuilder,java.lang.String,java.lang.String) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.internal.BackportedMethodListCommand$Builder$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.GA0:
+com.android.tools.r8.internal.BackportedMethodListCommand$Builder$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.JA0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String com.android.tools.r8.BackportedMethodListCommand$Builder$$InternalSyntheticOutline$164$9fd18f4b1a1be1e0e8e775682e26d5cb03e05af25b49234027e8808c9c7c46b6$0.m(java.lang.String,int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.internal.BackportedMethodRewriter$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.HA0:
+com.android.tools.r8.internal.BackportedMethodRewriter$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.KA0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     void com.android.tools.r8.ir.desugar.BackportedMethodRewriter$$InternalSyntheticOutline$164$ab2d0a194e19c3283ca2f511a6d1ae22df19b62f30dd2eac3975ca53affb809a$0.m(com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String,java.lang.String,java.lang.String) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.internal.BasicBlock$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.XA0:
+com.android.tools.r8.internal.BasicBlock$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.aB0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock$$InternalSyntheticOutline$164$c6397710c84bd6274d2a6208089314d80503b739a4091f012d2ccd7e2d226ec0$0.m(com.android.tools.r8.ir.code.BasicBlock) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.internal.BisectState$Range$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.FB0:
+com.android.tools.r8.internal.BisectState$Range$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.IB0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String com.android.tools.r8.bisect.BisectState$Range$$InternalSyntheticOutline$164$67d728c3820f1d7ee8574685fd7f7d72fa74c44bc6b7842a407c66b976eda554$0.m(java.lang.StringBuilder,int,java.lang.String) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.internal.CollectPreconditions$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.kI0:
+com.android.tools.r8.internal.CollectPreconditions$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.nI0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String com.android.tools.r8.com.google.common.collect.CollectPreconditions$$InternalSyntheticOutline$164$c0ce2ffde8014d615702286296d5b655702c6cc61d3927e8a059c1845724fe9b$0.m(java.lang.String,java.lang.Object) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.internal.CommittedSyntheticsCollection$$ExternalSyntheticThrowCCEIfNotNull0 -> com.android.tools.r8.internal.DI0:
+com.android.tools.r8.internal.CommittedSyntheticsCollection$$ExternalSyntheticThrowCCEIfNotNull0 -> com.android.tools.r8.internal.GI0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     void com.android.tools.r8.synthesis.CommittedSyntheticsCollection$$InternalSyntheticThrowCCEIfNotNull$29$091ed5e7b6c58b2b76af3be0efbb4e4367fc18f3fa260852bf1b819c435aac6e$0.m(java.lang.Object) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.internal.DexClass$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.EL0:
+com.android.tools.r8.internal.DexClass$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.HL0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String com.android.tools.r8.graph.DexClass$$InternalSyntheticOutline$164$d13488128ee26545b0c114c7e9565c710bd571651a8f8e4a8174eb06d8b9f35e$0.m(com.android.tools.r8.graph.DexField,java.lang.StringBuilder,java.lang.String) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.internal.DexFileMergerHelper$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.NL0:
+com.android.tools.r8.internal.DexFileMergerHelper$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.QL0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.StringBuilder com.android.tools.r8.DexFileMergerHelper$$InternalSyntheticOutline$164$49b0f831dbd5e440101a996d3f2df3a1228a5fb6bce5a83befd97abd08649975$0.m(java.lang.String) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.internal.DexOutputBuffer$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.qM0:
+com.android.tools.r8.internal.DexOutputBuffer$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.tM0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.StringBuilder com.android.tools.r8.dex.DexOutputBuffer$$InternalSyntheticOutline$164$d3b7e19c636ac5d555aaa9c30a59a8f95c44471cab6bc19d94f0e0dbf7746a9b$0.m(java.lang.String,int,java.lang.String) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.internal.GenerateLintFiles$HTMLBuilder$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.yQ0:
+com.android.tools.r8.internal.GenerateLintFiles$HTMLBuilder$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.BQ0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String com.android.tools.r8.GenerateLintFiles$HTMLBuilder$$InternalSyntheticOutline$164$8cb54dbc508c2fda5c346b06a8f419f12417bf313e5908e55dc2dca4f19f657d$0.m(java.lang.String,int,int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.internal.Int2IntOpenHashMap$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.KU0:
+com.android.tools.r8.internal.Int2IntOpenHashMap$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.NU0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     long com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$$InternalSyntheticOutline$164$da3bc391a2c1c1e53219f62456f1ddd70a51e58bed6e8532a63c21af985ce95b$0.m(long,long,long) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.internal.Intrinsics$$ExternalSyntheticCheckNotZero0 -> com.android.tools.r8.internal.GX0:
+com.android.tools.r8.internal.Intrinsics$$ExternalSyntheticCheckNotZero0 -> com.android.tools.r8.internal.JX0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:1:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.throwParameterIsNullNPE(java.lang.String):140:140 -> a
@@ -67961,12 +68004,12 @@ com.android.tools.r8.internal.Intrinsics$$ExternalSyntheticCheckNotZero0 -> com.
     14:14:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.throwParameterIsNullNPE(java.lang.String):140:140 -> a
     14:14:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.checkNotNullParameter(java.lang.Object,java.lang.String):131 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.internal.Murmur3_128HashFunction$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.c91:
+com.android.tools.r8.internal.Murmur3_128HashFunction$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.f91:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$$InternalSyntheticOutline$164$78d213ed9d4a72f1d78251cd094966c3f734b1cc1183f7f4336fed52d674377f$0.m(java.lang.String,int,java.lang.String) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.internal.qG0:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.internal.tG0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> c
     boolean $assertionsDisabled -> e
@@ -67985,12 +68028,12 @@ com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tool
     1:1:void notifyCodeHasChanged():217:217 -> b
     2:4:void com.android.tools.r8.ir.analysis.ClassInitializationAnalysis.returnMarkingColor():227:229 -> b
     2:4:void notifyCodeHasChanged():218 -> b
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption -> com.android.tools.r8.internal.nG0:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption -> com.android.tools.r8.internal.qG0:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption NONE -> b
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption INSTRUCTION_DOES_NOT_THROW -> a
     1:2:void <clinit>():57:58 -> <clinit>
     1:1:void <init>(java.lang.String,int):56:56 -> <init>
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> com.android.tools.r8.internal.oG0:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> com.android.tools.r8.internal.rG0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():233:233 -> <clinit>
     1:6:boolean forInitClass(com.android.tools.r8.ir.code.InitClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):241:246 -> a
@@ -68029,12 +68072,12 @@ com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils ->
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> b
     2:2:boolean forStaticGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):480 -> b
     3:10:boolean forStaticGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):480:487 -> b
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.internal.pG0:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.internal.sG0:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY_OR_INDIRECTLY -> b
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY -> a
     1:2:void <clinit>():62:63 -> <clinit>
     1:1:void <init>(java.lang.String,int):61:61 -> <init>
-com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.internal.mL0:
+com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.internal.pL0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:2:boolean returnValueOnlyDependsOnArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):22:23 -> a
@@ -68067,9 +68110,9 @@ com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.int
     24:24:boolean returnValueOnlyDependsOnArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):67 -> a
     25:27:boolean returnValueOnlyDependsOnArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):68:70 -> a
     28:28:boolean returnValueOnlyDependsOnArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59:59 -> a
-com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis -> com.android.tools.r8.internal.CT0:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis -> com.android.tools.r8.internal.FT0:
     1:15:java.util.Set computeInitializedClassesOnNormalExit(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):40:54 -> a
-com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> com.android.tools.r8.internal.BT0:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> com.android.tools.r8.internal.ET0:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set initializedClassesOnNormalExit -> c
     com.android.tools.r8.graph.ProgramMethod context -> b
@@ -68090,7 +68133,7 @@ com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor
     65:65:java.lang.Object visit(com.android.tools.r8.ir.code.NewInstance):57 -> a
     66:66:java.lang.Void com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor.visit(com.android.tools.r8.ir.code.NewUnboxedEnumInstance):160:160 -> a
     66:66:java.lang.Object visit(com.android.tools.r8.ir.code.NewUnboxedEnumInstance):57 -> a
-com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.internal.yr1:
+com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.internal.qr1:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.VerifyTypesHelper verifyTypesHelper -> b
     boolean $assertionsDisabled -> c
@@ -68113,7 +68156,7 @@ com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.internal.yr
     34:36:boolean com.android.tools.r8.ir.analysis.TypeChecker.check(com.android.tools.r8.ir.code.Throw):117:119 -> a
     34:36:boolean check(com.android.tools.r8.ir.code.IRCode):57 -> a
     37:49:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):96:108 -> a
-com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.internal.Js1:
+com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.internal.Cs1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> d
@@ -68166,7 +68209,7 @@ com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.andr
     145:145:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):46:46 -> a
     145:145:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):320 -> a
     146:175:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):321:350 -> a
-    176:176:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():237:237 -> a
+    176:176:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():203:203 -> a
     176:176:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):351 -> a
     177:182:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):357:362 -> a
     183:191:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):370:378 -> a
@@ -68194,7 +68237,7 @@ com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.andr
     1:5:boolean isNonPinnedClassConstant(com.android.tools.r8.ir.code.Value):274:278 -> b
     6:6:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):164:164 -> b
     6:6:boolean isNonPinnedClassConstant(com.android.tools.r8.ir.code.Value):278 -> b
-com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState -> com.android.tools.r8.internal.Is1:
+com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState -> com.android.tools.r8.internal.Bs1:
     java.util.Set trackedValues -> b
     com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState EMPTY -> c
     boolean hasTrackedValueEscaped -> a
@@ -68202,21 +68245,21 @@ com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValu
     1:6:void <init>():428:433 -> <init>
     1:1:com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState empty():436:436 -> a
     2:2:boolean isTrackingValue(com.android.tools.r8.ir.code.Value):449:449 -> a
-com.android.tools.r8.ir.analysis.VerifyTypesHelper -> com.android.tools.r8.internal.Qs1:
+com.android.tools.r8.ir.analysis.VerifyTypesHelper -> com.android.tools.r8.internal.Js1:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):14:15 -> <init>
     1:1:com.android.tools.r8.ir.analysis.VerifyTypesHelper create(com.android.tools.r8.graph.AppView):19:19 -> a
     2:28:boolean isAssignable(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement):23:49 -> a
-com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.internal.hC0:
+com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.internal.kC0:
     com.android.tools.r8.ir.analysis.constant.Bottom INSTANCE -> a
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.analysis.constant.LatticeElement meet(com.android.tools.r8.ir.analysis.constant.LatticeElement) -> a
     1:1:com.android.tools.r8.ir.analysis.constant.Bottom getInstance():13:13 -> c
     1:1:java.lang.String toString():28:28 -> toString
-com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.internal.rJ0:
+com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.internal.uJ0:
     com.android.tools.r8.ir.code.ConstNumber value -> a
     1:2:void <init>(com.android.tools.r8.ir.code.ConstNumber):11:12 -> <init>
     com.android.tools.r8.ir.analysis.constant.ConstLatticeElement asConst() -> a
@@ -68231,7 +68274,7 @@ com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.too
     1:1:com.android.tools.r8.ir.code.ConstNumber getConstNumber():47:47 -> c
     1:1:int getIntValue():51:51 -> d
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement -> com.android.tools.r8.internal.wJ0:
+com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement -> com.android.tools.r8.internal.zJ0:
     com.android.tools.r8.ir.code.Value value -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():8:8 -> <clinit>
@@ -68253,12 +68296,12 @@ com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement -> com.androi
     com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement asConstRange() -> b
     1:1:com.android.tools.r8.ir.code.Value getConstRange():44:44 -> c
     1:1:java.lang.String toString():40:40 -> toString
-com.android.tools.r8.ir.analysis.constant.LatticeElement -> com.android.tools.r8.internal.l41:
+com.android.tools.r8.ir.analysis.constant.LatticeElement -> com.android.tools.r8.internal.o41:
     1:1:void <init>():6:6 -> <init>
     com.android.tools.r8.ir.analysis.constant.ConstLatticeElement asConst() -> a
     com.android.tools.r8.ir.analysis.constant.LatticeElement meet(com.android.tools.r8.ir.analysis.constant.LatticeElement) -> a
     com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement asConstRange() -> b
-com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.internal.Jn1:
+com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.internal.Bn1:
     java.util.Deque ssaEdges -> d
     java.util.Map mapping -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -68347,14 +68390,14 @@ com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -
     117:130:void com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation.addFlowEdgesForJumpInstruction(com.android.tools.r8.ir.code.JumpInstruction):234:247 -> b
     117:130:void visitInstruction(com.android.tools.r8.ir.code.Instruction):180 -> b
     131:136:void setExecutableEdge(int,int):253:258 -> b
-com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.internal.Oq1:
+com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.internal.Gq1:
     com.android.tools.r8.ir.analysis.constant.Top INSTANCE -> a
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.analysis.constant.LatticeElement meet(com.android.tools.r8.ir.analysis.constant.LatticeElement) -> a
     1:1:com.android.tools.r8.ir.analysis.constant.Top getInstance():13:13 -> c
     1:1:java.lang.String toString():28:28 -> toString
-com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph -> com.android.tools.r8.internal.Gs1:
+com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph -> com.android.tools.r8.internal.zs1:
     java.util.Map nodes -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():27:27 -> <clinit>
@@ -68366,7 +68409,7 @@ com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph -> com.android
     6:13:void com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph.mergeNodes(java.lang.Iterable):45:52 -> b
     6:13:void mergeStronglyConnectedComponents():62 -> b
     14:14:void mergeStronglyConnectedComponents():63:63 -> b
-com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node -> com.android.tools.r8.internal.Fs1:
+com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node -> com.android.tools.r8.internal.ys1:
     java.util.Set predecessors -> c
     java.util.Set successors -> d
     com.android.tools.r8.ir.code.Value value -> a
@@ -68381,7 +68424,7 @@ com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node -> com.an
     1:1:java.util.Set access$200(com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node):68:68 -> c
     1:1:com.android.tools.r8.ir.code.Value access$300(com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node):68:68 -> d
     1:12:void moveEdgesTo(com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node):99:110 -> e
-com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption -> com.android.tools.r8.internal.eB0:
+com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption -> com.android.tools.r8.internal.hB0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.ProgramMethod context -> b
     boolean $assertionsDisabled -> c
@@ -68397,11 +68440,11 @@ com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption ->
     58:58:boolean com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption.passesIdenticalValuesForPhis(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):282:282 -> a
     58:58:boolean isSubsumedBy(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):81 -> a
     59:75:boolean isSubsumedBy(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):84:100 -> a
-    76:77:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):33:34 -> a
+    76:77:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):38:39 -> a
     76:77:boolean isSubsumedBy(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):100 -> a
     78:104:boolean isSubsumedBy(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):102:128 -> a
     105:110:boolean isSubsumedBy(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):127:132 -> a
-    111:112:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):33:34 -> a
+    111:112:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):38:39 -> a
     111:112:boolean isSubsumedBy(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):133 -> a
     113:122:boolean isSubsumedBy(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):137:146 -> a
     123:123:boolean isSubsumedBy(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):145:145 -> a
@@ -68437,7 +68480,7 @@ com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption ->
     1:1:boolean com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption.definesBlockLocalValue(com.android.tools.r8.ir.code.Instruction):172:172 -> c
     1:1:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.ir.code.Instruction):155 -> c
     2:10:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.ir.code.Instruction):158:166 -> c
-com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.internal.lO0:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.internal.oO0:
     java.util.Deque valuesToTrack -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set trackedValues -> c
@@ -68466,9 +68509,9 @@ com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.i
     103:105:void addToWorklist(com.android.tools.r8.ir.code.Value):171:173 -> a
     1:9:boolean isEscaping(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):56:64 -> b
     10:10:boolean isValueOfInterestOrAlias(com.android.tools.r8.ir.code.Value):214:214 -> b
-com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.internal.mO0:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.internal.pO0:
     boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod) -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis -> com.android.tools.r8.internal.CO0:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis -> com.android.tools.r8.internal.FO0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker fieldAssignmentTracker -> b
     com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis fieldBitAccessAnalysis -> c
@@ -68480,7 +68523,7 @@ com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis -> com.android.
     5:24:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):65:84 -> a
     25:30:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):83:88 -> a
     31:41:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):87:97 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker -> com.android.tools.r8.internal.LO0:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker -> com.android.tools.r8.internal.OO0:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set nonZeroFields -> d
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph fieldAccessGraph -> b
@@ -68521,7 +68564,7 @@ com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker -> com.andro
     141:141:void lambda$waveDone$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedField):326 -> a
     142:144:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):249:249 -> a
     142:144:void lambda$waveDone$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedField):326 -> a
-    145:145:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> a
+    145:145:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> a
     145:145:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):253 -> a
     145:145:void lambda$waveDone$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedField):326 -> a
     146:146:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):254:254 -> a
@@ -68542,7 +68585,7 @@ com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker -> com.andro
     205:213:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):323:331 -> a
     214:214:void lambda$waveDone$4(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexProgramClass):328:328 -> a
     1:5:void initializeAbstractInstanceFieldValues():87:91 -> b
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph -> com.android.tools.r8.internal.JO0:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph -> com.android.tools.r8.internal.MO0:
     java.util.Map fieldWrites -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap pendingFieldWrites -> b
     1:1:void <init>():344:344 -> <init>
@@ -68552,7 +68595,7 @@ com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessG
     14:14:java.util.List lambda$initialize$0(com.android.tools.r8.graph.DexEncodedMethod):360:360 -> a
     15:16:void lambda$initialize$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.ProgramMethod):360:361 -> a
     17:24:void markProcessed(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):368:375 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$ObjectAllocationGraph -> com.android.tools.r8.internal.KO0:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$ObjectAllocationGraph -> com.android.tools.r8.internal.NO0:
     java.util.Map objectAllocations -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap pendingObjectAllocations -> b
     1:1:void <init>():392:392 -> <init>
@@ -68561,7 +68604,7 @@ com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$ObjectAlloca
     3:6:void lambda$initialize$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set):399:402 -> a
     7:7:java.util.List lambda$initialize$0(com.android.tools.r8.graph.DexEncodedMethod):400:400 -> a
     8:15:void markProcessed(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):408:415 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.internal.MO0:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.internal.PO0:
     1:1:void <init>():16:16 -> <init>
     1:9:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):20:28 -> a
     10:18:int com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis.computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):34:42 -> a
@@ -68573,7 +68616,7 @@ com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.andro
     20:30:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):29 -> a
     31:31:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):29:29 -> a
     32:48:boolean isOnlyUsedToUpdateFieldValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexEncodedField):66:82 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> com.android.tools.r8.internal.nr1:
+com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> com.android.tools.r8.internal.fr1:
     java.util.Map readFields -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map writtenFields -> d
@@ -68623,14 +68666,14 @@ com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> co
     148:148:boolean com.android.tools.r8.graph.FieldAccessInfo.isAccessedFromMethodHandle():38:38 -> a
     148:148:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):260 -> a
     149:154:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):261:266 -> a
-    155:155:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexEncodedField.getTypeElement(com.android.tools.r8.graph.AppView):199:199 -> a
+    155:155:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexEncodedField.getTypeElement(com.android.tools.r8.graph.AppView):165:165 -> a
     155:155:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):266 -> a
     156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> a
     156:156:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexField.getTypeElement(com.android.tools.r8.graph.AppView):66 -> a
-    156:156:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexEncodedField.getTypeElement(com.android.tools.r8.graph.AppView):199 -> a
+    156:156:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexEncodedField.getTypeElement(com.android.tools.r8.graph.AppView):165 -> a
     156:156:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):266 -> a
     157:157:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexField.getTypeElement(com.android.tools.r8.graph.AppView):66:66 -> a
-    157:157:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexEncodedField.getTypeElement(com.android.tools.r8.graph.AppView):199 -> a
+    157:157:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexEncodedField.getTypeElement(com.android.tools.r8.graph.AppView):165 -> a
     157:157:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):266 -> a
     158:163:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):266:271 -> a
     1:1:java.util.Map access$100(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):41:41 -> b
@@ -68644,15 +68687,15 @@ com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> co
     1:1:java.util.Set access$300(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):41:41 -> d
     1:1:java.util.Set access$400(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):41:41 -> e
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet access$500(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):41:41 -> f
-com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry -> com.android.tools.r8.internal.mr1:
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor this$0 -> d
-    com.android.tools.r8.graph.ProgramMethod method -> c
+com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry -> com.android.tools.r8.internal.er1:
+    com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor this$0 -> e
+    boolean $assertionsDisabled -> f
+    com.android.tools.r8.graph.ProgramMethod method -> d
     1:1:void <clinit>():290:290 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor,com.android.tools.r8.graph.ProgramMethod):294:296 -> <init>
     void registerInvokeDirect(com.android.tools.r8.graph.DexMethod) -> a
     1:8:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean):300:307 -> a
-    9:9:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> a
+    9:9:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> a
     9:9:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean):309 -> a
     10:12:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean):309:311 -> a
     13:13:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
@@ -68702,7 +68745,7 @@ com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet -> com.andr
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems) -> a
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet asKnownFieldSet() -> b
     boolean isKnownFieldSet() -> c
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.internal.fJ0:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.internal.iJ0:
     java.util.Set fields -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():19:19 -> <clinit>
@@ -68726,7 +68769,7 @@ com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> c
     1:5:boolean equals(java.lang.Object):113:117 -> equals
     1:1:int hashCode():105:105 -> hashCode
     1:1:int size():100:100 -> size
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.internal.aN0:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.internal.dN0:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet INSTANCE -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():16:16 -> <init>
@@ -68735,7 +68778,7 @@ com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet asKnownFieldSet() -> b
     boolean isKnownFieldSet() -> c
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet getInstance():19:19 -> d
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.internal.hP0:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.internal.kP0:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> e
@@ -68828,13 +68871,13 @@ com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.an
     55:55:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():285 -> c
     56:80:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():286:310 -> c
     1:4:com.android.tools.r8.ir.code.DominatorTree getOrCreateDominatorTree():69:72 -> d
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo -> com.android.tools.r8.internal.gP0:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo -> com.android.tools.r8.internal.jP0:
     com.android.tools.r8.ir.code.Instruction instruction -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo instanceFieldInitializationInfo -> b
     1:3:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):44:46 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction access$000(com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo):38:38 -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo access$100(com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo):38:38 -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis -> com.android.tools.r8.internal.dU0:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis -> com.android.tools.r8.internal.gU0:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexClassAndMethod parentConstructor -> k
     com.android.tools.r8.ir.code.InvokeDirect parentConstructorCall -> l
@@ -68849,7 +68892,7 @@ com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis -
     2:27:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):73 -> a
     28:28:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):74:74 -> a
     29:29:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):133:133 -> a
-    30:30:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():237:237 -> a
+    30:30:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():203:203 -> a
     30:30:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.fieldNeverWrittenBetweenInstancePutAndMethodExit(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.InstancePut):232 -> a
     30:30:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):133 -> a
     31:63:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.fieldNeverWrittenBetweenInstancePutAndMethodExit(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.InstancePut):236:268 -> a
@@ -68865,7 +68908,7 @@ com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis -
     67:67:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):134 -> a
     68:93:void analyzeForwardingConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.Value):139:164 -> a
     94:112:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInstanceFieldInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):197:215 -> a
-    113:113:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():237:237 -> a
+    113:113:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():203:203 -> a
     113:113:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.fieldNeverWrittenBetweenParentConstructorCallAndMethodExit(com.android.tools.r8.graph.DexEncodedField):277 -> a
     113:113:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):182 -> a
     114:114:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.fieldNeverWrittenBetweenParentConstructorCallAndMethodExit(com.android.tools.r8.graph.DexEncodedField):280:280 -> a
@@ -68883,7 +68926,7 @@ com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis -
     123:124:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):188:189 -> a
     125:125:void com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder.recordInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):50:50 -> a
     125:125:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):189 -> a
-    126:126:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> a
+    126:126:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> a
     126:126:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField):123 -> a
     127:127:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField):123:123 -> a
     1:1:boolean isSubjectToOptimizationIgnoringPinning(com.android.tools.r8.graph.DexEncodedField):128:128 -> b
@@ -68891,10 +68934,10 @@ com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis -
     4:4:void com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder.recordInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):50:50 -> b
     4:4:void recordInstanceFieldIsInitializedWithInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):221 -> b
     1:11:void analyzeParentConstructorCall():169:179 -> e
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.internal.j21:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.internal.m21:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet asConcreteFieldSet() -> a
     boolean contains(com.android.tools.r8.graph.DexEncodedField) -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis -> com.android.tools.r8.internal.po1:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis -> com.android.tools.r8.internal.ho1:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder builder -> i
     boolean $assertionsDisabled -> k
     java.util.Map computedValues -> j
@@ -68936,7 +68979,7 @@ com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis ->
     89:92:com.android.tools.r8.ir.analysis.value.AbstractValue getOrComputeAbstractValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField):192 -> a
     93:95:com.android.tools.r8.ir.analysis.value.SingleFieldValue com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.computeSingleFieldValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):203:205 -> a
     93:95:com.android.tools.r8.ir.analysis.value.AbstractValue getOrComputeAbstractValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField):192 -> a
-    96:96:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> a
+    96:96:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> a
     96:96:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField):120 -> a
     97:98:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField):121:122 -> a
     99:100:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):442:443 -> a
@@ -68961,7 +69004,7 @@ com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis ->
     142:142:void lambda$computeObjectState$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.ObjectState$Builder,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):480 -> a
     143:150:void lambda$computeObjectState$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.ObjectState$Builder,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):483:490 -> a
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis asStaticFieldValueAnalysis() -> b
-    1:1:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> b
+    1:1:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> b
     1:1:boolean isSubjectToOptimizationIgnoringPinning(com.android.tools.r8.graph.DexEncodedField):127 -> b
     2:5:boolean isSubjectToOptimizationIgnoringPinning(com.android.tools.r8.graph.DexEncodedField):128:131 -> b
     6:44:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForInstance(com.android.tools.r8.ir.code.Value):381:419 -> b
@@ -69018,7 +69061,7 @@ com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis ->
     94:94:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.valuesArrayIndexMatchesOrdinal(int,com.android.tools.r8.ir.analysis.value.ObjectState):376:376 -> d
     94:94:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):296 -> d
     95:136:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):299:340 -> d
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues -> com.android.tools.r8.internal.vo1:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues -> com.android.tools.r8.internal.no1:
     1:1:void <init>():15:15 -> <init>
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues asEnumStaticFieldValues() -> a
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder builder(com.android.tools.r8.graph.DexProgramClass):26:26 -> a
@@ -69026,25 +69069,25 @@ com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues -> com.and
     2:2:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder builder(com.android.tools.r8.graph.DexProgramClass):26 -> a
     3:3:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues.builder():113:113 -> a
     3:3:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder builder(com.android.tools.r8.graph.DexProgramClass):26 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder -> com.android.tools.r8.internal.qo1:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder -> com.android.tools.r8.internal.io1:
     1:1:void <init>():29:29 -> <init>
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues build() -> a
     void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory) -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues -> com.android.tools.r8.internal.so1:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues -> com.android.tools.r8.internal.ko1:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues INSTANCE -> a
     1:1:void <clinit>():104:104 -> <clinit>
     1:1:void <init>():106:106 -> <init>
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues getInstance():109:109 -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues$Builder -> com.android.tools.r8.internal.ro1:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues$Builder -> com.android.tools.r8.internal.jo1:
     1:1:void <init>():116:116 -> <init>
     void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory) -> a
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues build():126:126 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues -> com.android.tools.r8.internal.uo1:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues -> com.android.tools.r8.internal.mo1:
     com.android.tools.r8.com.google.common.collect.ImmutableMap enumAbstractValues -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):42:43 -> <init>
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues asEnumStaticFieldValues() -> a
     1:1:com.android.tools.r8.ir.analysis.value.ObjectState getObjectStateForPossiblyPinnedField(com.android.tools.r8.graph.DexField):99:99 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues$Builder -> com.android.tools.r8.internal.to1:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues$Builder -> com.android.tools.r8.internal.lo1:
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder enumObjectStateBuilder -> a
     com.android.tools.r8.ir.analysis.value.AbstractValue valuesCandidateAbstractValue -> b
     boolean $assertionsDisabled -> c
@@ -69059,7 +69102,7 @@ com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStatic
     12:18:void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory):66:72 -> a
     19:19:void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory):71:71 -> a
     20:25:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues build():79:84 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.internal.Wr1:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.internal.Or1:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet INSTANCE -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():16:16 -> <init>
@@ -69073,21 +69116,21 @@ com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState -> com.
 com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractTransferFunction -> com.android.tools.r8.internal.o1:
     com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult apply(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState) -> a
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState computeBlockEntryState(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState) -> a
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult -> com.android.tools.r8.internal.XJ0:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult -> com.android.tools.r8.internal.aK0:
     1:1:void <init>():21:21 -> <init>
     com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult asSuccessfulAnalysisResult() -> a
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$FailedDataflowAnalysisResult -> com.android.tools.r8.internal.VJ0:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$FailedDataflowAnalysisResult -> com.android.tools.r8.internal.YJ0:
     1:1:void <init>():65:65 -> <init>
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult -> com.android.tools.r8.internal.WJ0:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult -> com.android.tools.r8.internal.ZJ0:
     java.util.Map blockExitStates -> a
     1:2:void <init>(java.util.Map):41:42 -> <init>
     com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult asSuccessfulAnalysisResult() -> a
     1:2:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState join():47:48 -> b
-com.android.tools.r8.ir.analysis.framework.intraprocedural.FailedTransferFunctionResult -> com.android.tools.r8.internal.zO0:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.FailedTransferFunctionResult -> com.android.tools.r8.internal.CO0:
     1:1:void <init>():16:16 -> <init>
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState():20:20 -> a
     boolean isFailedTransferResult() -> b
-com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis -> com.android.tools.r8.internal.FX0:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis -> com.android.tools.r8.internal.IX0:
     java.util.Map blockExitStates -> c
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState bottom -> a
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractTransferFunction transfer -> b
@@ -69118,7 +69161,7 @@ com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDatafl
     26:27:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.ir.code.BasicBlock):43 -> a
     28:31:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.run(com.android.tools.r8.utils.WorkList):72:75 -> a
     28:31:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.ir.code.BasicBlock):43 -> a
-com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult -> com.android.tools.r8.internal.cr1:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult -> com.android.tools.r8.internal.Uq1:
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState() -> a
     boolean isFailedTransferResult() -> b
     boolean isAbstractState() -> c
@@ -69129,7 +69172,7 @@ com.android.tools.r8.ir.analysis.inlining.AlwaysSimpleInliningConstraint -> com.
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterRemovingThisParameter(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory) -> a
     boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod) -> a
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint rewrittenWithUnboxedArguments(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory) -> a
-com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint -> com.android.tools.r8.internal.eO0:
+com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint -> com.android.tools.r8.internal.hO0:
     boolean $assertionsDisabled -> e
     boolean value -> d
     1:1:void <clinit>():13:13 -> <clinit>
@@ -69141,7 +69184,7 @@ com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint
     6:6:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):32 -> a
     7:7:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):32:32 -> a
     8:8:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):44:44 -> a
-com.android.tools.r8.ir.analysis.inlining.EqualToNumberSimpleInliningConstraint -> com.android.tools.r8.internal.fO0:
+com.android.tools.r8.ir.analysis.inlining.EqualToNumberSimpleInliningConstraint -> com.android.tools.r8.internal.iO0:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>(int,long):10:10 -> <init>
@@ -69150,14 +69193,14 @@ com.android.tools.r8.ir.analysis.inlining.EqualToNumberSimpleInliningConstraint
     4:4:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):27:27 -> a
     5:5:com.android.tools.r8.ir.analysis.inlining.EqualToNumberSimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory.createEqualToNumberConstraint(int,long):94:94 -> a
     5:5:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):27 -> a
-com.android.tools.r8.ir.analysis.inlining.NeverSimpleInliningConstraint -> com.android.tools.r8.internal.C91:
+com.android.tools.r8.ir.analysis.inlining.NeverSimpleInliningConstraint -> com.android.tools.r8.internal.F91:
     com.android.tools.r8.ir.analysis.inlining.NeverSimpleInliningConstraint INSTANCE -> b
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterRemovingThisParameter(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory) -> a
     boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod) -> a
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint rewrittenWithUnboxedArguments(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory) -> a
-com.android.tools.r8.ir.analysis.inlining.NotEqualToNumberSimpleInliningConstraint -> com.android.tools.r8.internal.za1:
+com.android.tools.r8.ir.analysis.inlining.NotEqualToNumberSimpleInliningConstraint -> com.android.tools.r8.internal.Ca1:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>(int,long):10:10 -> <init>
@@ -69166,7 +69209,7 @@ com.android.tools.r8.ir.analysis.inlining.NotEqualToNumberSimpleInliningConstrai
     4:4:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):27:27 -> a
     5:5:com.android.tools.r8.ir.analysis.inlining.NotEqualToNumberSimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory.createNotEqualToNumberConstraint(int,long):89:89 -> a
     5:5:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):27 -> a
-com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint -> com.android.tools.r8.internal.Ca1:
+com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint -> com.android.tools.r8.internal.Fa1:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> d
     1:1:void <clinit>():15:15 -> <clinit>
@@ -69180,14 +69223,14 @@ com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint -> com.an
     22:22:com.android.tools.r8.ir.analysis.inlining.NotEqualToNumberSimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory.createNotEqualToNumberConstraint(int,long):89:89 -> a
     22:22:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint rewrittenWithUnboxedArguments(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):55 -> a
     23:23:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):63:63 -> a
-com.android.tools.r8.ir.analysis.inlining.NumberSimpleInliningConstraint -> com.android.tools.r8.internal.Ma1:
+com.android.tools.r8.ir.analysis.inlining.NumberSimpleInliningConstraint -> com.android.tools.r8.internal.Pa1:
     long rawValue -> d
     1:2:void <init>(int,long):17:18 -> <init>
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint rewrittenWithUnboxedArguments(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory) -> a
     boolean test(long) -> a
     1:3:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):27:29 -> a
     1:1:long getRawValue():22:22 -> i
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint -> com.android.tools.r8.internal.Xm1:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint -> com.android.tools.r8.internal.Pm1:
     int argumentIndex -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():10:10 -> <clinit>
@@ -69203,7 +69246,7 @@ com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint -> co
     1:1:com.android.tools.r8.ir.code.Value getArgument(com.android.tools.r8.ir.code.InvokeMethod):26:26 -> b
     boolean isArgumentConstraint() -> d
     1:1:int getArgumentIndex():30:30 -> h
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint -> com.android.tools.r8.internal.Ym1:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint -> com.android.tools.r8.internal.Qm1:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -69253,7 +69296,7 @@ com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint -> com.androi
     boolean isConjunction() -> e
     boolean isDisjunction() -> f
     boolean isNever() -> g
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis -> com.android.tools.r8.internal.an1:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis -> com.android.tools.r8.internal.Sm1:
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory factory -> a
     java.util.Set seen -> d
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -69343,10 +69386,10 @@ com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis -> co
     1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$analyzeInstructionsInBlock$1(com.android.tools.r8.ir.code.If,int):144:144 -> b
     2:2:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis.analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int):76:76 -> b
     2:2:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$analyzeInstructionsInBlock$1(com.android.tools.r8.ir.code.If,int):144 -> b
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis$1 -> com.android.tools.r8.internal.Zm1:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis$1 -> com.android.tools.r8.internal.Rm1:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():172:172 -> <clinit>
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintConjunction -> com.android.tools.r8.internal.bn1:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintConjunction -> com.android.tools.r8.internal.Tm1:
     java.util.List constraints -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
@@ -69373,7 +69416,7 @@ com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintConjunction ->
     28:28:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$fixupAfterRemovingThisParameter$0(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):73:73 -> a
     29:35:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint rewrittenWithUnboxedArguments(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):82:88 -> a
     36:36:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$rewrittenWithUnboxedArguments$1(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):85:85 -> a
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction -> com.android.tools.r8.internal.cn1:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction -> com.android.tools.r8.internal.Um1:
     java.util.List constraints -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
@@ -69400,7 +69443,7 @@ com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction ->
     29:35:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint rewrittenWithUnboxedArguments(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):82:88 -> a
     36:36:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$rewrittenWithUnboxedArguments$1(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):85:85 -> a
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction asDisjunction() -> b
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory -> com.android.tools.r8.internal.dn1:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory -> com.android.tools.r8.internal.Vm1:
     com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint[] lowEqualToTrueConstraints -> b
     com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint[] lowEqualToFalseConstraints -> a
     com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint[] lowEqualToNullConstraints -> d
@@ -69419,14 +69462,14 @@ com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory -> com
     10:10:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint lambda$createArgumentConstraint$2(java.util.function.Supplier,java.lang.Integer):101:101 -> a
     1:1:com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint lambda$createEqualToBooleanConstraint$0(int,boolean):67:67 -> b
     2:2:com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint lambda$createNullConstraint$1(int,com.android.tools.r8.ir.analysis.type.Nullability):84:84 -> b
-com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.internal.H41:
+com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.internal.K41:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):20:33 -> a
     15:15:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1538:1538 -> a
     15:15:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):33 -> a
     16:24:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):33:41 -> a
-com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker -> com.android.tools.r8.internal.EN0:
+com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker -> com.android.tools.r8.internal.HN0:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set deadEnumLiteMaps -> c
@@ -69493,7 +69536,7 @@ com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker -> com.android.tool
     4:4:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> c
     4:4:void verifyDeadEnumLiteMapsAreDead():148 -> c
     5:5:void verifyDeadEnumLiteMapsAreDead():148:148 -> c
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.internal.BQ0:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.internal.EQ0:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map removedExtensionFields -> d
@@ -69538,13 +69581,13 @@ com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com
     1:3:boolean wasRemoved(com.android.tools.r8.graph.DexField):160:162 -> b
     4:6:void forEachFindLiteExtensionByNumberMethod(java.util.function.Consumer):212:214 -> b
     1:2:void forEachMethodThatRequiresPostOptimization(java.util.function.Consumer):184:185 -> c
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.internal.AQ0:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.internal.DQ0:
     com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker this$0 -> b
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):117:117 -> <init>
     1:1:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):122:122 -> a
     2:2:boolean com.android.tools.r8.shaking.DefaultTreePrunerConfiguration.isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):22:22 -> a
     2:2:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):123 -> a
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.internal.MQ0:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.internal.PQ0:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map builders -> d
@@ -69560,7 +69603,7 @@ com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> co
     48:48:boolean lambda$computeEnableAggressiveBuilderOptimization$0(com.android.tools.r8.graph.DexClass):97:97 -> a
     49:56:boolean deferDeadProtoBuilders(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,java.util.function.BooleanSupplier):172:179 -> a
     57:62:void rewriteDeadBuilderReferencesFromDynamicMethods(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):193:198 -> a
-    63:63:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):322:322 -> a
+    63:63:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):316:316 -> a
     63:63:void rewriteDeadBuilderReferencesFromDynamicMethods(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):198 -> a
     64:74:void rewriteDeadBuilderReferencesFromDynamicMethods(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):199:209 -> a
     75:76:void lambda$rewriteDeadBuilderReferencesFromDynamicMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):202:203 -> a
@@ -69612,7 +69655,7 @@ com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> co
     2:2:boolean lambda$computeEnableAggressiveBuilderOptimization$1(com.android.tools.r8.graph.DexClass):112:112 -> b
     3:4:com.android.tools.r8.graph.analysis.EnqueuerAnalysis createEnqueuerAnalysis():128:129 -> b
     1:1:com.android.tools.r8.ir.analysis.proto.ProtoReferences access$200(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):61:61 -> c
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$1 -> com.android.tools.r8.internal.KQ0:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$1 -> com.android.tools.r8.internal.NQ0:
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker this$0 -> b
     java.util.Set val$seen -> a
     boolean $assertionsDisabled -> c
@@ -69625,7 +69668,7 @@ com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$1 ->
     29:32:void lambda$notifyFixpoint$0(java.util.Set,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):155:158 -> a
     33:38:void lambda$notifyFixpoint$0(java.util.Set,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):157:162 -> a
     39:39:void lambda$notifyFixpoint$0(java.util.Set,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):161:161 -> a
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension -> com.android.tools.r8.internal.LQ0:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension -> com.android.tools.r8.internal.OQ0:
     java.util.Set bypassClinitforInlining -> g
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -69649,7 +69692,7 @@ com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootS
     6:7:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension.neverMergeGeneratedMessageLiteBuilder():464:465 -> b
     6:7:void extend(com.android.tools.r8.graph.SubtypingInfo):427 -> b
     8:9:void neverMergeClass(com.android.tools.r8.graph.DexType):475:476 -> b
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.internal.NQ0:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.internal.QQ0:
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder encoder -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> d
@@ -69727,18 +69770,18 @@ com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.andro
     64:69:void lambda$forEachDynamicMethod$1(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):98:103 -> a
     70:70:void lambda$forEachDynamicMethod$2(com.android.tools.r8.ir.desugar.LambdaDescriptor):107:107 -> a
     71:74:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):193:196 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.internal.Bh1:
-    com.android.tools.r8.shaking.EnqueuerUseRegistryFactory FACTORY -> i
-    com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> h
+com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.internal.Eh1:
+    com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> i
+    com.android.tools.r8.shaking.EnqueuerUseRegistryFactory FACTORY -> j
     1:1:void <clinit>():27:27 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer,java.util.function.BiFunction):36:37 -> <init>
     1:5:void registerConstClass(com.android.tools.r8.graph.DexType,java.util.ListIterator):54:58 -> a
-    1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getFactory():41:41 -> d
     1:2:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):78:79 -> e
     3:9:boolean com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry.isStaticFieldReadForProtoSchemaDefinition(com.android.tools.r8.graph.DexField):88:94 -> e
     3:9:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):80 -> e
     10:13:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):81:84 -> e
-com.android.tools.r8.ir.analysis.proto.ProtoEnumSwitchMapRemover -> com.android.tools.r8.internal.Ch1:
+    1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getFactory():41:41 -> f
+com.android.tools.r8.ir.analysis.proto.ProtoEnumSwitchMapRemover -> com.android.tools.r8.internal.Fh1:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> a
     java.util.Map staticFieldValuesMap -> b
     java.util.Map staticFieldValuesMapDelayed -> c
@@ -69753,7 +69796,7 @@ com.android.tools.r8.ir.analysis.proto.ProtoEnumSwitchMapRemover -> com.android.
     8:12:boolean isProtoEnum(com.android.tools.r8.graph.DexProgramClass):48:52 -> a
     13:24:com.android.tools.r8.ir.analysis.value.SingleNumberValue getOrdinal(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):57:68 -> a
     25:30:com.android.tools.r8.ir.analysis.value.SingleNumberValue getOrdinal(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):67:72 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.internal.Hh1:
+com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.internal.Kh1:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy parent -> a
     boolean $assertionsDisabled -> c
@@ -69795,7 +69838,7 @@ com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.androi
     38:38:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):46 -> a
     39:42:com.android.tools.r8.ir.optimize.Inliner$Reason com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy.computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):79:82 -> a
     39:42:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):46 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.internal.Xh1:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.internal.ai1:
     com.android.tools.r8.graph.DexType generatedMessageLiteExtendableMessageType -> l
     com.android.tools.r8.graph.DexType generatedMessageLiteBuilderType -> j
     com.android.tools.r8.graph.DexType methodToInvokeType -> n
@@ -69846,28 +69889,28 @@ com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.i
     6:6:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isAbstractGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):141:141 -> c
     6:6:boolean isGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):183 -> c
     1:1:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):187:187 -> d
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$1 -> com.android.tools.r8.internal.Rh1:
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.internal.Sh1:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$1 -> com.android.tools.r8.internal.Uh1:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.internal.Vh1:
     com.android.tools.r8.graph.DexMethod constructorWithClass -> b
     com.android.tools.r8.graph.DexMethod constructor -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):194:194 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):199:203 -> <init>
     7:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):201:213 -> <init>
     20:20:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):211:211 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.internal.Th1:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.internal.Wh1:
     com.android.tools.r8.graph.DexMethod constructorMethod -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):288:288 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):293:297 -> <init>
     7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):295:302 -> <init>
     15:15:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):300:300 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.internal.Uh1:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.internal.Xh1:
     com.android.tools.r8.graph.DexMethod constructorMethod -> b
     com.android.tools.r8.graph.DexMethod buildPartialMethod -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):307:307 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):312:316 -> <init>
     7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):314:321 -> <init>
     15:15:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):319:319 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.internal.Vh1:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.internal.Yh1:
     com.android.tools.r8.graph.DexMethod newSingularGeneratedExtension -> e
     com.android.tools.r8.graph.DexMethod newRepeatedGeneratedExtension -> d
     com.android.tools.r8.graph.DexMethod dynamicMethodBridgeMethodWithObject -> c
@@ -69881,7 +69924,7 @@ com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMetho
     32:39:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):255:262 -> <init>
     40:55:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):260:275 -> <init>
     56:56:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):273:273 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.internal.Wh1:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.internal.Zh1:
     com.android.tools.r8.graph.DexField newMutableInstanceField -> f
     com.android.tools.r8.graph.DexField newBuilderField -> e
     com.android.tools.r8.graph.DexField setMemoizedIsInitializedField -> g
@@ -69891,7 +69934,7 @@ com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers ->
     com.android.tools.r8.graph.DexField getMemoizedIsInitializedField -> c
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):327:327 -> <init>
     2:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):337:354 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.internal.Yh1:
+com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.internal.bi1:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> b
     com.android.tools.r8.ir.analysis.proto.ProtoEnumSwitchMapRemover protoEnumSwitchMapRemover -> g
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker generatedMessageLiteBuilderShrinker -> e
@@ -69906,7 +69949,7 @@ com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.int
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):30:30 -> <init>
     2:28:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):28:54 -> <init>
     1:7:com.android.tools.r8.ir.analysis.proto.ProtoShrinker create(com.android.tools.r8.graph.AppView):58:64 -> a
-    8:8:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():478:478 -> a
+    8:8:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():479:479 -> a
     8:8:com.android.tools.r8.ir.analysis.proto.ProtoShrinker create(com.android.tools.r8.graph.AppView):66 -> a
     9:13:com.android.tools.r8.ir.analysis.proto.ProtoShrinker create(com.android.tools.r8.graph.AppView):66:70 -> a
     14:18:void com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.disable():1450:1454 -> a
@@ -69914,18 +69957,18 @@ com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.int
     19:19:com.android.tools.r8.ir.analysis.proto.ProtoShrinker create(com.android.tools.r8.graph.AppView):74:74 -> a
     20:20:java.util.Set getDeadProtoTypes():78:78 -> a
     21:23:boolean verifyDeadProtoTypesNotReferenced(com.android.tools.r8.dex.VirtualFile):88:90 -> a
-    24:24:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():874:874 -> a
+    24:24:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():880:880 -> a
     24:24:void setDeadProtoTypes(java.util.Set):83 -> a
     25:25:void setDeadProtoTypes(java.util.Set):84:84 -> a
-    26:26:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():875:875 -> a
+    26:26:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():881:881 -> a
     26:26:void setDeadProtoTypes(java.util.Set):83 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.internal.bi1:
+com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.internal.ei1:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():11:11 -> <clinit>
     1:3:com.android.tools.r8.ir.code.Value getInfoValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):17:19 -> a
     1:3:com.android.tools.r8.ir.code.Value getObjectsValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):24:26 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.internal.mi1:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.internal.pi1:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> a
     boolean $assertionsDisabled -> c
@@ -69983,7 +70026,7 @@ com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tool
     4:19:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):311:326 -> b
     20:20:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):319:319 -> b
     21:21:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):308:308 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.internal.ji1:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.internal.mi1:
     com.android.tools.r8.utils.ThrowingCharIterator charIterator -> a
     1:3:void <init>(com.android.tools.r8.graph.DexString):261:263 -> <init>
     1:1:boolean hasNext():267:267 -> a
@@ -69995,7 +70038,7 @@ com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.to
     9:9:int nextInt():293:293 -> b
     10:10:int nextInt():282:282 -> b
     11:11:int nextInt():273:273 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.internal.ki1:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.internal.ni1:
     com.android.tools.r8.ir.code.Value val$objectsValue -> c
     com.android.tools.r8.ir.code.InstructionIterator val$instructionIterator -> b
     int expectedNextIndex -> a
@@ -70010,10 +70053,10 @@ com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.to
     16:16:java.lang.Object next():326 -> b
     17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2.next():348:348 -> b
     17:17:java.lang.Object next():326 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.internal.li1:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.internal.oi1:
     1:1:void <init>():371:371 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1):371:371 -> <init>
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.internal.ni1:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.internal.qi1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):24:25 -> <init>
     1:1:com.android.tools.r8.graph.DexString encodeInfo(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):29:29 -> a
@@ -70037,24 +70080,24 @@ com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tool
     57:68:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder.encodeInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):85:96 -> a
     57:68:com.android.tools.r8.graph.DexString encodeInfo(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):77 -> a
     1:12:java.util.List encodeObjects(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):100:111 -> b
-com.android.tools.r8.ir.analysis.proto.schema.DeadProtoFieldObject -> com.android.tools.r8.internal.dK0:
+com.android.tools.r8.ir.analysis.proto.schema.DeadProtoFieldObject -> com.android.tools.r8.internal.gK0:
     com.android.tools.r8.graph.DexString name -> b
     com.android.tools.r8.graph.DexType holder -> a
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):20:22 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27:27 -> a
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.internal.s51:
+com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.internal.v51:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):23:24 -> <init>
     com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject asLiveProtoFieldObject() -> a
     1:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):34:35 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     3:3:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo.defaultForConstString(com.android.tools.r8.utils.InternalOptions):124 -> a
     3:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):35 -> a
     4:7:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:39 -> a
     1:1:com.android.tools.r8.graph.DexField getField():28:28 -> g
     1:1:java.lang.String toString():54:54 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.internal.Ah1:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.internal.Dh1:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> c
     java.util.Set dynamicMethodsWithTracedProtoObjects -> h
     com.android.tools.r8.graph.AppView appView -> a
@@ -70164,7 +70207,7 @@ com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.andr
     436:458:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):662:684 -> a
     1:25:void populateExtensionGraph(com.android.tools.r8.shaking.Enqueuer):218:242 -> b
     26:26:java.util.Set lambda$populateExtensionGraphWithExtensionFieldDefinition$3(com.android.tools.r8.graph.DexType):354:354 -> b
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.internal.Dh1:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.internal.Gh1:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType type -> b
     java.util.List objects -> d
     boolean $assertionsDisabled -> e
@@ -70221,11 +70264,11 @@ com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tool
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType getType():66:66 -> d
     1:1:boolean hasAuxData():44:44 -> e
     1:15:java.lang.String toString():209:223 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.internal.Eh1:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.internal.Hh1:
     1:1:void <init>():7:7 -> <init>
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject asProtoFieldObject() -> b
     boolean isProtoFieldObject() -> f
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.internal.Fh1:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.internal.Ih1:
     boolean isMapFieldWithProto2EnumValue -> e
     boolean hasHasBit -> f
     boolean $assertionsDisabled -> g
@@ -70255,7 +70298,7 @@ com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tool
     1:1:boolean isValid():134:134 -> k
     1:1:boolean needsIsInitializedCheck():139:139 -> l
     1:14:int serialize():159:172 -> m
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.internal.Gh1:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.internal.Jh1:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap fieldTypes -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
@@ -70264,7 +70307,7 @@ com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.andro
     2:16:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.fromFieldIdWithExtraBits(int):56:70 -> a
     2:16:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType createField(int):17 -> a
     17:18:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType createField(int):18:19 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.internal.Lh1:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.internal.Oh1:
     java.util.LinkedList hasBitsObjects -> d
     java.util.LinkedList oneOfObjects -> e
     int flags -> b
@@ -70285,8 +70328,8 @@ com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.to
     1:1:int numberOfHasBitsObjects():245:245 -> j
     1:1:int numberOfOneOfObjects():249:249 -> k
     1:9:java.lang.String toString():254:262 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.internal.Ih1:
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.internal.Jh1:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.internal.Lh1:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.internal.Mh1:
     java.util.LinkedList hasBitsObjects -> d
     java.util.LinkedList oneOfObjects -> e
     boolean $assertionsDisabled -> f
@@ -70325,10 +70368,10 @@ com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.an
     89:96:void removeUnusedSharedData():165:172 -> c
     97:97:void removeUnusedSharedData():171:171 -> c
     98:99:void removeUnusedSharedData():84:85 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$ProtoMessageInfoBuilderException -> com.android.tools.r8.internal.Kh1:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$ProtoMessageInfoBuilderException -> com.android.tools.r8.internal.Nh1:
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1):180:180 -> <init>
     2:2:void <init>():181:181 -> <init>
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.internal.Mh1:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.internal.Ph1:
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject asLiveProtoFieldObject() -> a
     com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
@@ -70337,18 +70380,18 @@ com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r
     com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject asProtoTypeObject() -> d
     boolean isDeadProtoFieldObject() -> e
     boolean isProtoFieldObject() -> f
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.internal.Nh1:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.internal.Qh1:
     com.android.tools.r8.graph.DexMethod method -> a
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):21:22 -> <init>
     1:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27:29 -> a
     4:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):28:30 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.internal.Oh1:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.internal.Rh1:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):20:21 -> <init>
     1:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):30:32 -> a
     com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet asProtoObjectFromStaticGet() -> c
     1:1:com.android.tools.r8.graph.DexField getField():25:25 -> g
-com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.internal.Ph1:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.internal.Sh1:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,boolean,boolean,boolean,boolean,boolean):20:20 -> <init>
@@ -70360,7 +70403,7 @@ com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android
     boolean isRepeated() -> h
     boolean isSingular() -> j
     1:1:boolean isValid():60:60 -> k
-com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.internal.Qh1:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.internal.Th1:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject oneOfCaseObject -> b
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject oneOfObject -> a
     1:3:void <init>(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject,com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject):15:17 -> <init>
@@ -70368,7 +70411,7 @@ com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.androi
     2:3:void forEach(java.util.function.Consumer):29:30 -> a
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject getOneOfObject():21:21 -> b
     1:1:java.util.stream.Stream stream():34:34 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.tools.r8.internal.Zh1:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.tools.r8.internal.ci1:
     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
@@ -70376,7 +70419,7 @@ com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.too
     2:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject asProtoTypeObject() -> d
     1:1:com.android.tools.r8.graph.DexType getType():21:21 -> g
-com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis -> com.android.tools.r8.internal.AG0:
+com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis -> com.android.tools.r8.internal.DG0:
     1:13:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):43:55 -> a
     14:14:boolean com.android.tools.r8.ir.code.Instruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):624:624 -> a
     14:14:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
@@ -70391,7 +70434,7 @@ com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis -
     78:91:boolean com.android.tools.r8.ir.code.IRCode.controlFlowMayDependOnEnvironment(java.util.function.Consumer):301:314 -> a
     78:91:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):101 -> a
     92:95:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):106:109 -> a
-com.android.tools.r8.ir.analysis.type.ArrayTypeElement -> com.android.tools.r8.internal.Uz0:
+com.android.tools.r8.ir.analysis.type.ArrayTypeElement -> com.android.tools.r8.internal.Xz0:
     com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> g
     boolean $assertionsDisabled -> h
     com.android.tools.r8.ir.analysis.type.TypeElement memberTypeLattice -> f
@@ -70424,14 +70467,14 @@ com.android.tools.r8.ir.analysis.type.ArrayTypeElement -> com.android.tools.r8.i
     1:1:int hashCode():133:133 -> hashCode
     boolean isArrayType() -> r
     1:1:java.lang.String toString():113:113 -> toString
-com.android.tools.r8.ir.analysis.type.BooleanTypeElement -> com.android.tools.r8.internal.fC0:
+com.android.tools.r8.ir.analysis.type.BooleanTypeElement -> com.android.tools.r8.internal.iC0:
     com.android.tools.r8.ir.analysis.type.BooleanTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.BooleanTypeElement getInstance():11:11 -> I
     1:1:int hashCode():31:31 -> hashCode
     1:1:java.lang.String toString():21:21 -> toString
-com.android.tools.r8.ir.analysis.type.BottomTypeElement -> com.android.tools.r8.internal.sC0:
+com.android.tools.r8.ir.analysis.type.BottomTypeElement -> com.android.tools.r8.internal.vC0:
     com.android.tools.r8.ir.analysis.type.BottomTypeElement INSTANCE -> c
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -70439,21 +70482,21 @@ com.android.tools.r8.ir.analysis.type.BottomTypeElement -> com.android.tools.r8.
     1:1:com.android.tools.r8.ir.analysis.type.BottomTypeElement getInstance():15:15 -> H
     1:1:int hashCode():35:35 -> hashCode
     1:1:java.lang.String toString():25:25 -> toString
-com.android.tools.r8.ir.analysis.type.ByteTypeElement -> com.android.tools.r8.internal.IC0:
+com.android.tools.r8.ir.analysis.type.ByteTypeElement -> com.android.tools.r8.internal.LC0:
     com.android.tools.r8.ir.analysis.type.ByteTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ByteTypeElement getInstance():11:11 -> I
     1:1:int hashCode():31:31 -> hashCode
     1:1:java.lang.String toString():21:21 -> toString
-com.android.tools.r8.ir.analysis.type.CharTypeElement -> com.android.tools.r8.internal.IF0:
+com.android.tools.r8.ir.analysis.type.CharTypeElement -> com.android.tools.r8.internal.LF0:
     com.android.tools.r8.ir.analysis.type.CharTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.CharTypeElement getInstance():11:11 -> I
     1:1:int hashCode():31:31 -> hashCode
     1:1:java.lang.String toString():21:21 -> toString
-com.android.tools.r8.ir.analysis.type.ClassTypeElement -> com.android.tools.r8.internal.yH0:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement -> com.android.tools.r8.internal.BH0:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.AppView appView -> g
@@ -70518,7 +70561,7 @@ com.android.tools.r8.ir.analysis.type.ClassTypeElement -> com.android.tools.r8.i
     boolean isClassType() -> s
     1:16:java.lang.String toString():159:174 -> toString
     17:26:java.lang.String toString():167:176 -> toString
-com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker -> com.android.tools.r8.internal.wH0:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker -> com.android.tools.r8.internal.zH0:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker LEFT_KNOWN -> c
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker RIGHT_UNKNOWN -> f
     com.android.tools.r8.utils.OptionalBool left -> a
@@ -70535,11 +70578,11 @@ com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker -> com.an
     5:5:boolean merge(com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):358 -> a
     6:17:boolean merge(com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):358:369 -> a
     1:2:boolean knownIfBothAreKnown():353:354 -> b
-com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceWithMarker -> com.android.tools.r8.internal.xH0:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceWithMarker -> com.android.tools.r8.internal.AH0:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker marker -> b
     com.android.tools.r8.graph.DexType itf -> a
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):378:380 -> <init>
-com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.internal.KK0:
+com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.internal.NK0:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
     java.util.function.Function mapping -> b
@@ -70582,14 +70625,14 @@ com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.t
     58:58:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
     58:58:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):73 -> a
     59:59:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):73:73 -> a
-com.android.tools.r8.ir.analysis.type.DoubleTypeElement -> com.android.tools.r8.internal.LM0:
+com.android.tools.r8.ir.analysis.type.DoubleTypeElement -> com.android.tools.r8.internal.OM0:
     com.android.tools.r8.ir.analysis.type.DoubleTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.DoubleTypeElement getInstance():11:11 -> I
     1:1:int hashCode():26:26 -> hashCode
     1:1:java.lang.String toString():21:21 -> toString
-com.android.tools.r8.ir.analysis.type.DynamicType -> com.android.tools.r8.internal.TM0:
+com.android.tools.r8.ir.analysis.type.DynamicType -> com.android.tools.r8.internal.WM0:
     com.android.tools.r8.ir.analysis.type.TypeElement dynamicUpperBoundType -> a
     com.android.tools.r8.ir.analysis.type.DynamicType NULL_TYPE -> c
     com.android.tools.r8.ir.analysis.type.DynamicType BOTTOM -> b
@@ -70644,7 +70687,7 @@ com.android.tools.r8.ir.analysis.type.DynamicType -> com.android.tools.r8.intern
     2:2:boolean isUnknown():123 -> g
     1:1:com.android.tools.r8.ir.analysis.type.DynamicType unknown():95:95 -> h
     1:1:int hashCode():185:185 -> hashCode
-com.android.tools.r8.ir.analysis.type.DynamicTypeWithLowerBound -> com.android.tools.r8.internal.VM0:
+com.android.tools.r8.ir.analysis.type.DynamicTypeWithLowerBound -> com.android.tools.r8.internal.YM0:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement dynamicLowerBoundType -> g
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():11:11 -> <clinit>
@@ -70678,7 +70721,7 @@ com.android.tools.r8.ir.analysis.type.DynamicTypeWithLowerBound -> com.android.t
     4:4:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithLowerBound.getDynamicLowerBoundType():48:48 -> hashCode
     4:4:int hashCode():63 -> hashCode
     5:5:int hashCode():63:63 -> hashCode
-com.android.tools.r8.ir.analysis.type.ExactDynamicType -> com.android.tools.r8.internal.nO0:
+com.android.tools.r8.ir.analysis.type.ExactDynamicType -> com.android.tools.r8.internal.qO0:
     1:1:void <init>(com.android.tools.r8.ir.analysis.type.ClassTypeElement):10:10 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ExactDynamicType.getDynamicUpperBoundType():20:20 -> a
     1:1:com.android.tools.r8.ir.analysis.type.DynamicType withNullability(com.android.tools.r8.ir.analysis.type.Nullability):44 -> a
@@ -70699,21 +70742,21 @@ com.android.tools.r8.ir.analysis.type.ExactDynamicType -> com.android.tools.r8.i
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ExactDynamicType.getDynamicLowerBoundType():25 -> hashCode
     1:1:int hashCode():39 -> hashCode
     2:2:int hashCode():39:39 -> hashCode
-com.android.tools.r8.ir.analysis.type.FloatTypeElement -> com.android.tools.r8.internal.FP0:
+com.android.tools.r8.ir.analysis.type.FloatTypeElement -> com.android.tools.r8.internal.IP0:
     com.android.tools.r8.ir.analysis.type.FloatTypeElement INSTANCE -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.FloatTypeElement getInstance():10:10 -> I
     1:1:int hashCode():25:25 -> hashCode
     1:1:java.lang.String toString():20:20 -> toString
-com.android.tools.r8.ir.analysis.type.IntTypeElement -> com.android.tools.r8.internal.ZW0:
+com.android.tools.r8.ir.analysis.type.IntTypeElement -> com.android.tools.r8.internal.cX0:
     com.android.tools.r8.ir.analysis.type.IntTypeElement INSTANCE -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.IntTypeElement getInstance():10:10 -> I
     1:1:int hashCode():25:25 -> hashCode
     1:1:java.lang.String toString():20:20 -> toString
-com.android.tools.r8.ir.analysis.type.InterfaceCollection -> com.android.tools.r8.internal.bX0:
+com.android.tools.r8.ir.analysis.type.InterfaceCollection -> com.android.tools.r8.internal.eX0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap interfaces -> a
     com.android.tools.r8.ir.analysis.type.InterfaceCollection EMPTY -> b
     boolean $assertionsDisabled -> c
@@ -70728,7 +70771,7 @@ com.android.tools.r8.ir.analysis.type.InterfaceCollection -> com.android.tools.r
     7:7:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.get(java.lang.Object):108:108 -> a
     7:7:com.android.tools.r8.utils.OptionalBool contains(com.android.tools.r8.graph.DexType):153 -> a
     8:10:com.android.tools.r8.utils.OptionalBool contains(com.android.tools.r8.graph.DexType):155:157 -> a
-    11:11:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    11:11:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     11:11:boolean com.android.tools.r8.utils.InternalOptions.canHaveZipFileWithMissingCloseableBug():2170 -> a
     11:11:boolean isKnownToImplement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):24 -> a
     12:12:boolean com.android.tools.r8.utils.InternalOptions.canHaveZipFileWithMissingCloseableBug():2170:2170 -> a
@@ -70744,8 +70787,8 @@ com.android.tools.r8.ir.analysis.type.InterfaceCollection -> com.android.tools.r
     1:1:boolean isEmpty():96:96 -> f
     1:1:int size():100:100 -> g
     1:1:int hashCode():117:117 -> hashCode
-com.android.tools.r8.ir.analysis.type.InterfaceCollection$1 -> com.android.tools.r8.internal.aX0:
-com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder -> com.android.tools.r8.internal.bX0$a:
+com.android.tools.r8.ir.analysis.type.InterfaceCollection$1 -> com.android.tools.r8.internal.dX0:
+com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder -> com.android.tools.r8.internal.eX0$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap interfaces -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.type.InterfaceCollection$1):32:32 -> <init>
     2:2:void <init>():35:35 -> <init>
@@ -70753,14 +70796,14 @@ com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder -> com.android
     1:1:com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder addInterface(com.android.tools.r8.graph.DexType,boolean):49:49 -> a
     2:2:java.lang.Boolean lambda$addInterface$0(boolean,com.android.tools.r8.graph.DexType,java.lang.Boolean):53:53 -> a
     3:6:com.android.tools.r8.ir.analysis.type.InterfaceCollection build():58:61 -> a
-com.android.tools.r8.ir.analysis.type.LongTypeElement -> com.android.tools.r8.internal.f61:
+com.android.tools.r8.ir.analysis.type.LongTypeElement -> com.android.tools.r8.internal.i61:
     com.android.tools.r8.ir.analysis.type.LongTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.LongTypeElement getInstance():11:11 -> I
     1:1:int hashCode():26:26 -> hashCode
     1:1:java.lang.String toString():21:21 -> toString
-com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.internal.Da1:
+com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.internal.Ga1:
     com.android.tools.r8.ir.analysis.type.Nullability DEFINITELY_NULL -> a
     com.android.tools.r8.ir.analysis.type.Nullability BOTTOM -> d
     com.android.tools.r8.ir.analysis.type.Nullability MAYBE_NULL -> c
@@ -70779,7 +70822,7 @@ com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.intern
     1:1:boolean isMaybeNull():45:45 -> g
     1:1:com.android.tools.r8.ir.analysis.type.Nullability maybeNull():99:99 -> h
     1:13:java.lang.String toString():108:120 -> toString
-com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.internal.Ea1:
+com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.internal.Ha1:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement maybeNullVariant -> a
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement bottomVariant -> d
@@ -70791,7 +70834,7 @@ com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r
     4:12:void set(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.ReferenceTypeElement):26:34 -> a
     13:21:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement get(com.android.tools.r8.ir.analysis.type.Nullability):39:47 -> a
     22:35:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateElement(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.BiFunction):53:66 -> a
-com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement -> com.android.tools.r8.internal.if1:
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement -> com.android.tools.r8.internal.lf1:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -70838,10 +70881,10 @@ com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement -> com.android.tools.
     15:15:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):57 -> b
     16:18:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):58:60 -> b
     com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement asPrimitiveType() -> c
-com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement$1 -> com.android.tools.r8.internal.hf1:
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement$1 -> com.android.tools.r8.internal.kf1:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():113:113 -> <clinit>
-com.android.tools.r8.ir.analysis.type.ReferenceTypeElement -> com.android.tools.r8.internal.nk1:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeElement -> com.android.tools.r8.internal.lk1:
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement NULL_INSTANCE -> d
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement NULL_BOTTOM_INSTANCE -> e
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> c
@@ -70865,7 +70908,7 @@ com.android.tools.r8.ir.analysis.type.ReferenceTypeElement -> com.android.tools.
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement asReferenceType() -> d
     1:1:boolean equals(java.lang.Object):113:113 -> equals
     1:1:int hashCode():118:118 -> hashCode
-com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement -> com.android.tools.r8.internal.mk1:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement -> com.android.tools.r8.internal.kk1:
     1:1:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):14:14 -> <init>
     1:1:boolean com.android.tools.r8.ir.analysis.type.Nullability.isNullable():49:49 -> a
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):19 -> a
@@ -70873,14 +70916,14 @@ com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement -> com.an
     1:1:boolean equals(java.lang.Object):50:50 -> equals
     1:1:int hashCode():42:42 -> hashCode
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.type.ShortTypeElement -> com.android.tools.r8.internal.Tm1:
+com.android.tools.r8.ir.analysis.type.ShortTypeElement -> com.android.tools.r8.internal.Lm1:
     com.android.tools.r8.ir.analysis.type.ShortTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ShortTypeElement getInstance():11:11 -> I
     1:1:int hashCode():31:31 -> hashCode
     1:1:java.lang.String toString():21:21 -> toString
-com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement -> com.android.tools.r8.internal.ln1:
+com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement -> com.android.tools.r8.internal.dn1:
     com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement INSTANCE -> d
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -70888,7 +70931,7 @@ com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement -> com.android.
     1:1:com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement getInstance():16:16 -> H
     1:1:int hashCode():36:36 -> hashCode
     1:1:java.lang.String toString():26:26 -> toString
-com.android.tools.r8.ir.analysis.type.TopTypeElement -> com.android.tools.r8.internal.Rq1:
+com.android.tools.r8.ir.analysis.type.TopTypeElement -> com.android.tools.r8.internal.Jq1:
     com.android.tools.r8.ir.analysis.type.TopTypeElement INSTANCE -> c
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -70896,7 +70939,7 @@ com.android.tools.r8.ir.analysis.type.TopTypeElement -> com.android.tools.r8.int
     1:1:com.android.tools.r8.ir.analysis.type.TopTypeElement getInstance():15:15 -> H
     1:1:int hashCode():35:35 -> hashCode
     1:1:java.lang.String toString():25:25 -> toString
-com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.internal.ur1:
+com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.internal.mr1:
     java.util.Deque worklist -> d
     com.android.tools.r8.graph.AppView appView -> c
     boolean $assertionsDisabled -> e
@@ -70924,7 +70967,7 @@ com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.inter
     1:4:void widening(com.android.tools.r8.ir.code.IRCode):56:59 -> b
     5:5:boolean verifyValuesUpToDate(java.lang.Iterable):82:82 -> b
     1:1:void widening(java.lang.Iterable):63:63 -> c
-com.android.tools.r8.ir.analysis.type.TypeElement -> com.android.tools.r8.internal.Ar1:
+com.android.tools.r8.ir.analysis.type.TypeElement -> com.android.tools.r8.internal.sr1:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():20:20 -> <clinit>
@@ -71041,7 +71084,7 @@ com.android.tools.r8.ir.analysis.type.TypeElement -> com.android.tools.r8.intern
     7:7:boolean isPreciseType():370 -> z
     8:8:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> z
     8:8:boolean isPreciseType():371 -> z
-com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement -> com.android.tools.r8.internal.Dt1:
+com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement -> com.android.tools.r8.internal.wt1:
     com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement INSTANCE -> d
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -71115,9 +71158,10 @@ com.android.tools.r8.ir.analysis.value.AbstractValueFactory -> com.android.tools
     1:1:com.android.tools.r8.ir.analysis.value.SingleConstClassValue createSingleConstClassValue(com.android.tools.r8.graph.DexType):23:23 -> a
     2:4:com.android.tools.r8.ir.analysis.value.SingleFieldValue createSingleFieldValue(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.ObjectState):27:29 -> a
     5:5:com.android.tools.r8.ir.analysis.value.SingleNumberValue createSingleNumberValue(long):33:33 -> a
-    6:6:com.android.tools.r8.ir.analysis.value.SingleStringValue createSingleStringValue(com.android.tools.r8.graph.DexString):41:41 -> a
-    7:7:com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue createSingleDexItemBasedStringValue(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):46:46 -> a
-com.android.tools.r8.ir.analysis.value.BottomValue -> com.android.tools.r8.internal.uC0:
+    6:6:com.android.tools.r8.ir.analysis.value.SingleNumberValue createNullValue():37:37 -> a
+    7:7:com.android.tools.r8.ir.analysis.value.SingleStringValue createSingleStringValue(com.android.tools.r8.graph.DexString):41:41 -> a
+    8:8:com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue createSingleDexItemBasedStringValue(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):46:46 -> a
+com.android.tools.r8.ir.analysis.value.BottomValue -> com.android.tools.r8.internal.xC0:
     com.android.tools.r8.ir.analysis.value.BottomValue INSTANCE -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -71126,7 +71170,7 @@ com.android.tools.r8.ir.analysis.value.BottomValue -> com.android.tools.r8.inter
     boolean isNonTrivial() -> t
     1:1:java.lang.String toString():48:48 -> toString
     1:1:com.android.tools.r8.ir.analysis.value.BottomValue getInstance():18:18 -> z
-com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue -> com.android.tools.r8.internal.EJ0:
+com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue -> com.android.tools.r8.internal.HJ0:
     boolean containsInt(int) -> a
     com.android.tools.r8.utils.OptionalBool isSubsetOf(int[]) -> a
     boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue) -> a
@@ -71135,7 +71179,7 @@ com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue -> com.a
     com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue asNumberFromIntervalValue() -> d
     com.android.tools.r8.ir.analysis.value.SingleNumberValue asSingleNumberValue() -> e
     com.android.tools.r8.ir.analysis.value.NumberFromSetValue asNumberFromSetValue() -> i
-com.android.tools.r8.ir.analysis.value.EmptyObjectState -> com.android.tools.r8.internal.hN0:
+com.android.tools.r8.ir.analysis.value.EmptyObjectState -> com.android.tools.r8.internal.kN0:
     com.android.tools.r8.ir.analysis.value.EmptyObjectState INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -71145,7 +71189,7 @@ com.android.tools.r8.ir.analysis.value.EmptyObjectState -> com.android.tools.r8.
     boolean isEmpty() -> b
     1:1:com.android.tools.r8.ir.analysis.value.EmptyObjectState getInstance():21:21 -> c
     1:1:int hashCode():51:51 -> hashCode
-com.android.tools.r8.ir.analysis.value.EnumValuesObjectState -> com.android.tools.r8.internal.dO0:
+com.android.tools.r8.ir.analysis.value.EnumValuesObjectState -> com.android.tools.r8.internal.gO0:
     com.android.tools.r8.ir.analysis.value.ObjectState[] state -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -71161,14 +71205,14 @@ com.android.tools.r8.ir.analysis.value.EnumValuesObjectState -> com.android.tool
     1:1:int getEnumValuesSize():42:42 -> c
     1:9:boolean equals(java.lang.Object):72:80 -> equals
     1:1:int hashCode():89:89 -> hashCode
-com.android.tools.r8.ir.analysis.value.NonConstantNumberValue -> com.android.tools.r8.internal.ja1:
+com.android.tools.r8.ir.analysis.value.NonConstantNumberValue -> com.android.tools.r8.internal.ma1:
     1:1:void <init>():7:7 -> <init>
     com.android.tools.r8.ir.analysis.value.NonConstantNumberValue asNonConstantNumberValue() -> b
     boolean isNonConstantNumberValue() -> c
     com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue asConstantOrNonConstantNumberValue() -> k
     boolean isConstantOrNonConstantNumberValue() -> r
     long getAbstractionSize() -> z
-com.android.tools.r8.ir.analysis.value.NonEmptyObjectState -> com.android.tools.r8.internal.ma1:
+com.android.tools.r8.ir.analysis.value.NonEmptyObjectState -> com.android.tools.r8.internal.pa1:
     java.util.Map state -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -71180,7 +71224,7 @@ com.android.tools.r8.ir.analysis.value.NonEmptyObjectState -> com.android.tools.
     boolean isEmpty() -> b
     1:11:boolean equals(java.lang.Object):53:63 -> equals
     1:1:int hashCode():72:72 -> hashCode
-com.android.tools.r8.ir.analysis.value.NullOrAbstractValue -> com.android.tools.r8.internal.Ba1:
+com.android.tools.r8.ir.analysis.value.NullOrAbstractValue -> com.android.tools.r8.internal.Ea1:
     com.android.tools.r8.ir.analysis.value.AbstractValue value -> c
     1:2:void <init>(com.android.tools.r8.ir.analysis.value.AbstractValue):15:16 -> <init>
     1:1:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isBottom():0:0 -> a
@@ -71199,7 +71243,7 @@ com.android.tools.r8.ir.analysis.value.NullOrAbstractValue -> com.android.tools.
     boolean isNonTrivial() -> t
     1:1:java.lang.String toString():66:66 -> toString
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getNonNullValue():42:42 -> z
-com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue -> com.android.tools.r8.internal.Ha1:
+com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue -> com.android.tools.r8.internal.Ka1:
     long maxInclusive -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():13:13 -> <clinit>
@@ -71228,7 +71272,7 @@ com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue -> com.android.to
     boolean isNonTrivial() -> t
     1:1:java.lang.String toString():99:99 -> toString
     1:1:long getAbstractionSize():31:31 -> z
-com.android.tools.r8.ir.analysis.value.NumberFromSetValue -> com.android.tools.r8.internal.Ka1:
+com.android.tools.r8.ir.analysis.value.NumberFromSetValue -> com.android.tools.r8.internal.Na1:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet numbers -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():17:17 -> <clinit>
@@ -71251,8 +71295,8 @@ com.android.tools.r8.ir.analysis.value.NumberFromSetValue -> com.android.tools.r
     boolean isNonTrivial() -> t
     1:7:java.lang.String toString():110:116 -> toString
     1:1:long getAbstractionSize():46:46 -> z
-com.android.tools.r8.ir.analysis.value.NumberFromSetValue$1 -> com.android.tools.r8.internal.Ia1:
-com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder -> com.android.tools.r8.internal.Ja1:
+com.android.tools.r8.ir.analysis.value.NumberFromSetValue$1 -> com.android.tools.r8.internal.La1:
+com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder -> com.android.tools.r8.internal.Ma1:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet numbers -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():119:119 -> <clinit>
@@ -71261,14 +71305,14 @@ com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder -> com.android
     1:4:com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder addInt(int):132:135 -> a
     5:8:com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder addInts(com.android.tools.r8.ir.analysis.value.NumberFromSetValue):142:145 -> a
     9:17:com.android.tools.r8.ir.analysis.value.AbstractValue build(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):152:160 -> a
-com.android.tools.r8.ir.analysis.value.ObjectState -> com.android.tools.r8.internal.cd1:
+com.android.tools.r8.ir.analysis.value.ObjectState -> com.android.tools.r8.internal.fd1:
     1:1:void <init>():18:18 -> <init>
     com.android.tools.r8.ir.analysis.value.EnumValuesObjectState asEnumValuesObjectState() -> a
     void forEachAbstractFieldValue(java.util.function.BiConsumer) -> a
     com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractFieldValue(com.android.tools.r8.graph.DexEncodedField) -> a
     com.android.tools.r8.ir.analysis.value.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
     boolean isEmpty() -> b
-com.android.tools.r8.ir.analysis.value.ObjectState$Builder -> com.android.tools.r8.internal.bd1:
+com.android.tools.r8.ir.analysis.value.ObjectState$Builder -> com.android.tools.r8.internal.ed1:
     java.util.Map state -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():67:67 -> <clinit>
@@ -71278,45 +71322,45 @@ com.android.tools.r8.ir.analysis.value.ObjectState$Builder -> com.android.tools.
     5:5:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():25:25 -> a
     5:5:com.android.tools.r8.ir.analysis.value.ObjectState build():79 -> a
     6:6:com.android.tools.r8.ir.analysis.value.ObjectState build():79:79 -> a
-com.android.tools.r8.ir.analysis.value.SingleConstClassValue -> com.android.tools.r8.internal.fn1:
+com.android.tools.r8.ir.analysis.value.SingleConstClassValue -> com.android.tools.r8.internal.Xm1:
     com.android.tools.r8.graph.DexType type -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():26:26 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType):31:32 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):26:26 -> a
-    2:7:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):69:74 -> a
-    8:12:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):72:76 -> a
-    13:13:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):423:423 -> a
-    13:13:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):76 -> a
-    14:16:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):76:78 -> a
-    17:17:boolean com.android.tools.r8.ir.code.ConstClass.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):143:143 -> a
-    17:17:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):608 -> a
-    17:17:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):78 -> a
-    18:18:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):78:78 -> a
-    19:23:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):85:89 -> a
-    24:24:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):23:23 -> a
-    24:24:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):90 -> a
-    25:25:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):22:22 -> a
-    25:25:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):90 -> a
-    26:28:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):90:92 -> a
-    29:31:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):98:100 -> a
-    32:32:boolean com.android.tools.r8.graph.DexClass.isPublic():724:724 -> a
-    32:32:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):101 -> a
-    33:35:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):101:103 -> a
-    36:36:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):109:109 -> a
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):352:352 -> a
-    37:37:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):109 -> a
-    38:38:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):109:109 -> a
-    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):26:26 -> b
+    1:6:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):70:75 -> a
+    7:13:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):73:79 -> a
+    14:14:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):423:423 -> a
+    14:14:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):79 -> a
+    15:17:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):79:81 -> a
+    18:18:boolean com.android.tools.r8.ir.code.ConstClass.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):143:143 -> a
+    18:18:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):608 -> a
+    18:18:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):82 -> a
+    19:19:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):82:82 -> a
+    20:24:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):89:93 -> a
+    25:25:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):23:23 -> a
+    25:25:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):94 -> a
+    26:26:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):22:22 -> a
+    26:26:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):94 -> a
+    27:29:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):94:96 -> a
+    30:32:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):102:104 -> a
+    33:33:boolean com.android.tools.r8.graph.DexClass.isPublic():724:724 -> a
+    33:33:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):105 -> a
+    34:36:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):105:107 -> a
+    1:1:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):113:113 -> c
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):352:352 -> c
+    2:2:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):113 -> c
+    3:3:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):113:113 -> c
     1:1:int hashCode():56:56 -> hashCode
     com.android.tools.r8.ir.analysis.value.SingleConstClassValue asSingleConstClassValue() -> m
     1:1:java.lang.String toString():61:61 -> toString
     1:1:com.android.tools.r8.graph.DexType getType():46:46 -> z
-com.android.tools.r8.ir.analysis.value.SingleConstValue -> com.android.tools.r8.internal.gn1:
+com.android.tools.r8.ir.analysis.value.SingleConstValue -> com.android.tools.r8.internal.Ym1:
     1:1:void <init>():7:7 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo com.android.tools.r8.ir.analysis.value.SingleConstClassValue.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):26:26 -> a
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.analysis.value.SingleConstClassValue.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):26:26 -> b
     com.android.tools.r8.ir.analysis.value.SingleConstValue asSingleConstValue() -> n
     boolean isSingleConstValue() -> v
-com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue -> com.android.tools.r8.internal.in1:
+com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue -> com.android.tools.r8.internal.an1:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> d
     com.android.tools.r8.graph.DexReference item -> c
@@ -71325,43 +71369,36 @@ com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue -> com.andr
     1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():42:42 -> A
     boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView) -> a
     boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> a
-    1:6:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):79:84 -> a
-    7:12:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):82:87 -> a
-    13:14:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):107:108 -> a
-    13:14:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):26 -> a
-    15:15:com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createSingleDexItemBasedStringValue(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):46:46 -> a
-    15:15:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):108 -> a
-    15:15:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):26 -> a
-    1:2:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):107:108 -> b
-    1:2:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):26 -> b
-    3:3:com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createSingleDexItemBasedStringValue(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):46:46 -> b
-    3:3:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):108 -> b
-    3:3:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):26 -> b
+    1:6:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):80:85 -> a
+    7:15:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):83:91 -> a
+    1:2:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):111:112 -> c
+    3:3:com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createSingleDexItemBasedStringValue(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):46:46 -> c
+    3:3:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):112 -> c
     1:5:boolean equals(java.lang.Object):57:61 -> equals
     1:1:int hashCode():66:66 -> hashCode
     com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue asSingleDexItemBasedStringValue() -> o
     1:1:java.lang.String toString():71:71 -> toString
     1:1:com.android.tools.r8.graph.DexReference getItem():38:38 -> z
-com.android.tools.r8.ir.analysis.value.SingleFieldValue -> com.android.tools.r8.internal.jn1:
+com.android.tools.r8.ir.analysis.value.SingleFieldValue -> com.android.tools.r8.internal.bn1:
     com.android.tools.r8.graph.DexField field -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():28:28 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexField):32:33 -> <init>
     com.android.tools.r8.ir.analysis.value.ObjectState getState() -> A
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):28:28 -> a
-    2:5:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):74:77 -> a
-    6:7:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):84:85 -> a
-    8:18:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):90:100 -> a
+    2:5:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):75:78 -> a
+    6:7:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):85:86 -> a
+    8:18:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):91:101 -> a
     19:19:boolean com.android.tools.r8.graph.DexClass.isPublic():724:724 -> a
-    19:19:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):103 -> a
+    19:19:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):104 -> a
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):28:28 -> b
     2:8:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):43:49 -> b
-    1:9:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):108:116 -> c
-    10:10:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):115:115 -> c
+    1:9:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):109:117 -> c
+    10:10:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):116:116 -> c
     com.android.tools.r8.ir.analysis.value.SingleFieldValue asSingleFieldValue() -> p
     boolean isSingleFieldValue() -> w
     1:1:com.android.tools.r8.graph.DexField getField():37:37 -> z
-com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.internal.kn1:
+com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.internal.cn1:
     long value -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():22:22 -> <clinit>
@@ -71383,9 +71420,9 @@ com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8
     10:10:int com.android.tools.r8.ir.analysis.value.SingleNumberValue.getIntValue():91:91 -> a
     10:10:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):108 -> a
     11:11:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):108:108 -> a
-    12:17:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):131:136 -> a
-    18:20:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):135:137 -> a
+    12:20:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):132:140 -> a
     com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> b
+    com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> c
     com.android.tools.r8.ir.analysis.value.SingleNumberValue asSingleNumberValue() -> e
     1:1:int hashCode():118:118 -> hashCode
     com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue asConstantOrNonConstantNumberValue() -> k
@@ -71395,7 +71432,7 @@ com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8
     1:1:boolean isSingleBoolean():44 -> u
     1:1:boolean isTrue():54:54 -> y
     1:2:boolean getBooleanValue():78:79 -> z
-com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.tools.r8.internal.mn1:
+com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.tools.r8.internal.en1:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.analysis.value.ObjectState state -> e
     1:1:void <clinit>():10:10 -> <clinit>
@@ -71404,14 +71441,14 @@ com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.t
     1:5:boolean equals(java.lang.Object):33:37 -> equals
     1:1:int hashCode():42:42 -> hashCode
     1:1:java.lang.String toString():28:28 -> toString
-com.android.tools.r8.ir.analysis.value.SingleStatelessFieldValue -> com.android.tools.r8.internal.nn1:
+com.android.tools.r8.ir.analysis.value.SingleStatelessFieldValue -> com.android.tools.r8.internal.fn1:
     1:1:void <init>(com.android.tools.r8.graph.DexField):13:13 -> <init>
     1:1:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():25:25 -> A
     1:1:com.android.tools.r8.ir.analysis.value.ObjectState getState():18 -> A
     1:5:boolean equals(java.lang.Object):28:32 -> equals
     1:1:int hashCode():37:37 -> hashCode
     1:1:java.lang.String toString():23:23 -> toString
-com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.internal.on1:
+com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.internal.gn1:
     com.android.tools.r8.graph.DexString string -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():24:24 -> <clinit>
@@ -71419,23 +71456,27 @@ com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8
     boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView) -> a
     boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
-    1:6:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):67:72 -> a
-    7:13:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):70:76 -> a
+    1:6:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):68:73 -> a
+    7:16:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):71:80 -> a
     com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> b
+    com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> c
     1:1:int hashCode():54:54 -> hashCode
     com.android.tools.r8.ir.analysis.value.SingleStringValue asSingleStringValue() -> q
     1:1:java.lang.String toString():59:59 -> toString
     boolean isSingleStringValue() -> x
     1:1:com.android.tools.r8.graph.DexString getDexString():44:44 -> z
-com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.internal.qn1:
-    1:1:void <init>():17:17 -> <init>
-    com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier) -> a
+com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.internal.in1:
+    1:1:void <init>():18:18 -> <init>
+    com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier) -> a
     boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView) -> a
     boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> a
+    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):18:18 -> a
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):18:18 -> b
+    com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> c
     boolean isSingleValue() -> g
     com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> j
     boolean isNonTrivial() -> t
-com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.internal.ds1:
+com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.internal.Vr1:
     com.android.tools.r8.ir.analysis.value.UnknownValue INSTANCE -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -71572,7 +71613,7 @@ com.android.tools.r8.ir.code.Argument$Builder -> com.android.tools.r8.internal.s
     1:1:com.android.tools.r8.ir.code.Argument build():161:161 -> b
     2:3:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.Instruction$BuilderBase.amend(com.android.tools.r8.ir.code.Instruction):1604:1605 -> b
     2:3:com.android.tools.r8.ir.code.Argument build():161 -> b
-com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.internal.Lz0:
+com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.internal.Oz0:
     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>
@@ -71613,17 +71654,17 @@ com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.internal.Lz
     com.android.tools.r8.code.Instruction CreateLong(int,int,int) -> f
     com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop() -> l
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> m2
-com.android.tools.r8.ir.code.ArithmeticBinop$1 -> com.android.tools.r8.internal.Kz0:
+com.android.tools.r8.ir.code.ArithmeticBinop$1 -> com.android.tools.r8.internal.Nz0:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():75:75 -> <clinit>
-com.android.tools.r8.ir.code.ArrayAccess -> com.android.tools.r8.internal.Mz0:
+com.android.tools.r8.ir.code.ArrayAccess -> com.android.tools.r8.internal.Pz0:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):16:16 -> <init>
     com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType) -> a
     boolean isArrayAccess() -> c1
     1:1:com.android.tools.r8.ir.code.Value array():20:20 -> h2
     1:1:com.android.tools.r8.ir.code.Value index():24:24 -> i2
     com.android.tools.r8.ir.code.ArrayAccess asArrayAccess() -> m
-com.android.tools.r8.ir.code.ArrayGet -> com.android.tools.r8.internal.Qz0:
+com.android.tools.r8.ir.code.ArrayGet -> com.android.tools.r8.internal.Tz0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.MemberType type -> h
     1:1:void <clinit>():34:34 -> <clinit>
@@ -71706,7 +71747,7 @@ com.android.tools.r8.ir.code.ArrayGet -> com.android.tools.r8.internal.Qz0:
     int opcode() -> d2
     boolean throwsOnNullInput() -> g2
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> n
-com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.internal.Rz0:
+com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.internal.Uz0:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():144:144 -> I0
     boolean hasInvariantOutType() -> P0
@@ -71736,7 +71777,7 @@ com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.internal.Rz0:
     boolean throwsOnNullInput() -> g2
     1:1:com.android.tools.r8.ir.code.Value array():40:40 -> h2
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> o
-com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.internal.Tz0:
+com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.internal.Wz0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.MemberType type -> h
     1:1:void <clinit>():29:29 -> <clinit>
@@ -71781,7 +71822,7 @@ com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.internal.Tz0:
     boolean throwsOnNullInput() -> g2
     1:1:com.android.tools.r8.ir.code.Value value():55:55 -> j2
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> p
-com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.internal.kA0:
+com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.internal.nA0:
     com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption dynamicTypeAssumption -> h
     boolean $assertionsDisabled -> k
     com.android.tools.r8.ir.code.Instruction origin -> j
@@ -71822,7 +71863,7 @@ com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.internal.kA0:
     1:1:void unsetDynamicTypeAssumption():129:129 -> m2
     com.android.tools.r8.ir.code.Assume asAssume() -> q
     1:15:java.lang.String toString():277:291 -> toString
-com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption -> com.android.tools.r8.internal.iA0:
+com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption -> com.android.tools.r8.internal.lA0:
     com.android.tools.r8.ir.analysis.type.TypeElement dynamicUpperBoundType -> a
     com.android.tools.r8.ir.analysis.type.ClassTypeElement dynamicLowerBoundType -> b
     boolean $assertionsDisabled -> c
@@ -71841,14 +71882,14 @@ com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption -> com.android.tools.r
     2:2:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType():306:306 -> b
     1:5:boolean equals(java.lang.Object):325:329 -> equals
     1:1:int hashCode():335:335 -> hashCode
-com.android.tools.r8.ir.code.Assume$NonNullAssumption -> com.android.tools.r8.internal.jA0:
+com.android.tools.r8.ir.code.Assume$NonNullAssumption -> com.android.tools.r8.internal.mA0:
     com.android.tools.r8.ir.code.Assume$NonNullAssumption instance -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():339:341 -> <clinit>
     1:1:void <init>():343:343 -> <init>
     1:1:com.android.tools.r8.ir.code.Assume$NonNullAssumption get():346:346 -> a
     2:2:boolean verifyCorrectnessOfValues(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):350:350 -> a
-com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration -> com.android.tools.r8.internal.lA0:
+com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration -> com.android.tools.r8.internal.oA0:
     com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():9:11 -> <clinit>
@@ -71865,7 +71906,7 @@ com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration -> com.
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
     2:2:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):22 -> b
     3:3:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):22:22 -> b
-com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.internal.dB0:
+com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.internal.gB0:
     int color -> n
     int estimatedPredecessorsCount -> l
     int unfilledPredecessorsCount -> m
@@ -71883,302 +71924,302 @@ com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.internal.dB0:
     java.util.Map incompletePhis -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap localsAtEntry -> a
     1:1:void <clinit>():56:56 -> <clinit>
-    1:138:void <init>():56:193 -> <init>
-    1:2:com.android.tools.r8.ir.code.BasicBlock getUniqueNormalSuccessor():225:226 -> A
-    1:2:com.android.tools.r8.ir.code.BasicBlock getUniquePredecessor():288:289 -> B
-    1:2:com.android.tools.r8.ir.code.BasicBlock getUniqueSuccessor():220:221 -> C
-    1:2:boolean hasCatchHandlers():621:622 -> D
-    1:1:boolean hasIncompletePhis():1218:1218 -> E
-    1:1:boolean hasOneNormalExit():1598:1598 -> F
-    1:1:boolean hasPhis():588:588 -> G
-    1:1:boolean hasUniqueNormalSuccessor():212:212 -> H
-    1:1:boolean hasUniquePredecessor():284:284 -> I
-    1:1:boolean hasUniqueSuccessor():204:204 -> J
-    1:1:boolean hasUniqueSuccessorWithUniquePredecessor():208:208 -> K
-    1:2:void incrementUnfilledPredecessorCount():753:754 -> L
-    1:1:boolean isEmpty():690:690 -> M
-    1:1:boolean isFilled():609:609 -> N
-    1:1:boolean isReturnBlock():698:698 -> O
-    1:1:boolean isSealed():1206:1206 -> P
-    1:11:boolean isSimpleAlwaysThrowingPath():1575:1585 -> Q
-    1:1:boolean isTrivialGoto():1530:1530 -> R
-    1:1:com.android.tools.r8.ir.code.InstructionIterator iterator():1674:1674 -> S
-    1:2:boolean notifyPredecessorsMayChangeListeners():302:303 -> T
-    1:2:boolean notifySuccessorsMayChangeListeners():239:240 -> U
-    1:1:int numberOfCatchHandlers():1623:1623 -> V
-    1:2:int numberOfExceptionalSuccessors():277:278 -> W
-    1:4:int numberOfNormalSuccessors():270:273 -> X
-    1:2:int numberOfThrowingInstructions():1628:1629 -> Y
-    1:2:void removeAllNormalSuccessors():349:350 -> Z
+    1:142:void <init>():56:197 -> <init>
+    1:2:com.android.tools.r8.ir.code.BasicBlock getUniqueNormalSuccessor():229:230 -> A
+    1:2:com.android.tools.r8.ir.code.BasicBlock getUniquePredecessor():292:293 -> B
+    1:2:com.android.tools.r8.ir.code.BasicBlock getUniqueSuccessor():224:225 -> C
+    1:2:boolean hasCatchHandlers():625:626 -> D
+    1:1:boolean hasIncompletePhis():1222:1222 -> E
+    1:1:boolean hasOneNormalExit():1602:1602 -> F
+    1:1:boolean hasPhis():592:592 -> G
+    1:1:boolean hasUniqueNormalSuccessor():216:216 -> H
+    1:1:boolean hasUniquePredecessor():288:288 -> I
+    1:1:boolean hasUniqueSuccessor():208:208 -> J
+    1:1:boolean hasUniqueSuccessorWithUniquePredecessor():212:212 -> K
+    1:2:void incrementUnfilledPredecessorCount():757:758 -> L
+    1:1:boolean isEmpty():694:694 -> M
+    1:1:boolean isFilled():613:613 -> N
+    1:1:boolean isReturnBlock():702:702 -> O
+    1:1:boolean isSealed():1210:1210 -> P
+    1:11:boolean isSimpleAlwaysThrowingPath():1579:1589 -> Q
+    1:1:boolean isTrivialGoto():1534:1534 -> R
+    1:1:com.android.tools.r8.ir.code.InstructionIterator iterator():1678:1678 -> S
+    1:2:boolean notifyPredecessorsMayChangeListeners():306:307 -> T
+    1:2:boolean notifySuccessorsMayChangeListeners():243:244 -> U
+    1:1:int numberOfCatchHandlers():1627:1627 -> V
+    1:2:int numberOfExceptionalSuccessors():281:282 -> W
+    1:4:int numberOfNormalSuccessors():274:277 -> X
+    1:2:int numberOfThrowingInstructions():1632:1633 -> Y
+    1:2:void removeAllNormalSuccessors():353:354 -> Z
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> Z
-    3:3:void removeAllNormalSuccessors():350 -> Z
-    4:12:void removeAllNormalSuccessors():351:359 -> Z
+    3:3:void removeAllNormalSuccessors():354 -> Z
+    4:12:void removeAllNormalSuccessors():355:363 -> Z
     1:4:boolean consistentInitClassInstruction(com.android.tools.r8.ir.code.InitClass,boolean):92:95 -> a
     5:7:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):100:100 -> a
     8:8:boolean lambda$verifyTypes$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper,com.android.tools.r8.ir.code.Instruction):101:101 -> a
     9:9:void setLocalsAtEntry(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):106:106 -> a
-    10:14:void addControlFlowEdgesMayChangeListener(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):196:200 -> a
-    15:33:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):325:343 -> a
-    34:51:void swapSuccessorsByIndex(int,int):372:389 -> a
-    52:59:void replacePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):506:513 -> a
-    60:63:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):517:520 -> a
-    64:65:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):212:213 -> a
-    64:65:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):520 -> a
-    66:71:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):520:525 -> a
+    10:14:void addControlFlowEdgesMayChangeListener(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):200:204 -> a
+    15:33:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):329:347 -> a
+    34:51:void swapSuccessorsByIndex(int,int):376:393 -> a
+    52:59:void replacePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):510:517 -> a
+    60:63:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):521:524 -> a
+    64:65:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):220:221 -> a
+    64:65:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):524 -> a
+    66:71:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):524:529 -> a
     72:72:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.listIterator():192:192 -> a
     72:72:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180 -> a
-    72:72:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):525 -> a
-    73:91:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):525:543 -> a
+    72:72:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):529 -> a
+    73:91:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):529:547 -> a
     92:92:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.listIterator():192:192 -> a
     92:92:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180 -> a
-    92:92:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):545 -> a
-    93:109:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):545:561 -> a
-    110:111:boolean hasDeadPhi(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):592:593 -> a
-    112:112:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):652:652 -> a
-    113:114:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):729:730 -> a
-    115:117:void clearMark(int):742:744 -> a
-    118:118:void addPhi(com.android.tools.r8.ir.code.Phi):774:774 -> a
-    119:119:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):788:788 -> a
-    120:120:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():609:609 -> a
-    120:120:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):788 -> a
-    121:124:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):788:791 -> a
-    125:125:void close(com.android.tools.r8.ir.conversion.IRBuilder):795:795 -> a
-    126:126:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():609:609 -> a
-    126:126:void close(com.android.tools.r8.ir.conversion.IRBuilder):795 -> a
-    127:131:void close(com.android.tools.r8.ir.conversion.IRBuilder):795:799 -> a
-    132:133:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1660:1661 -> a
-    132:133:void close(com.android.tools.r8.ir.conversion.IRBuilder):800 -> a
-    134:134:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(int):1678:1678 -> a
-    134:134:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1661 -> a
-    134:134:void close(com.android.tools.r8.ir.conversion.IRBuilder):800 -> a
-    135:140:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1662:1667 -> a
-    135:140:void close(com.android.tools.r8.ir.conversion.IRBuilder):800 -> a
-    141:141:void close(com.android.tools.r8.ir.conversion.IRBuilder):801:801 -> a
-    142:153:void com.android.tools.r8.ir.code.BasicBlock.filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1165:1176 -> a
-    142:153:void close(com.android.tools.r8.ir.conversion.IRBuilder):802 -> a
-    154:154:boolean blocksClean(java.util.List):814:814 -> a
-    155:164:void removeCatchHandlerWithGuard(com.android.tools.r8.graph.DexType):894:903 -> a
-    165:165:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):900:900 -> a
-    166:170:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):929:933 -> a
+    92:92:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):549 -> a
+    93:109:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):549:565 -> a
+    110:111:boolean hasDeadPhi(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):596:597 -> a
+    112:112:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):656:656 -> a
+    113:114:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):733:734 -> a
+    115:117:void clearMark(int):746:748 -> a
+    118:118:void addPhi(com.android.tools.r8.ir.code.Phi):778:778 -> a
+    119:119:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):792:792 -> a
+    120:120:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():613:613 -> a
+    120:120:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):792 -> a
+    121:124:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):792:795 -> a
+    125:125:void close(com.android.tools.r8.ir.conversion.IRBuilder):799:799 -> a
+    126:126:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():613:613 -> a
+    126:126:void close(com.android.tools.r8.ir.conversion.IRBuilder):799 -> a
+    127:131:void close(com.android.tools.r8.ir.conversion.IRBuilder):799:803 -> a
+    132:133:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1664:1665 -> a
+    132:133:void close(com.android.tools.r8.ir.conversion.IRBuilder):804 -> a
+    134:134:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(int):1682:1682 -> a
+    134:134:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1665 -> a
+    134:134:void close(com.android.tools.r8.ir.conversion.IRBuilder):804 -> a
+    135:140:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1666:1671 -> a
+    135:140:void close(com.android.tools.r8.ir.conversion.IRBuilder):804 -> a
+    141:141:void close(com.android.tools.r8.ir.conversion.IRBuilder):805:805 -> a
+    142:153:void com.android.tools.r8.ir.code.BasicBlock.filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1169:1180 -> a
+    142:153:void close(com.android.tools.r8.ir.conversion.IRBuilder):806 -> a
+    154:154:boolean blocksClean(java.util.List):818:818 -> a
+    155:164:void removeCatchHandlerWithGuard(com.android.tools.r8.graph.DexType):898:907 -> a
+    165:165:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):904:904 -> a
+    166:170:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):933:937 -> a
     171:171:java.util.List com.android.tools.r8.ir.code.DominatorTree.dominatedBlocks(com.android.tools.r8.ir.code.BasicBlock) -> a
-    171:171:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):934 -> a
-    172:176:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):934:938 -> a
-    177:186:void linkCatchSuccessors(java.util.List,java.util.List):977:986 -> a
-    187:218:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):990:1021 -> a
-    219:224:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLens):1032:1037 -> a
+    171:171:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):938 -> a
+    172:176:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):938:942 -> a
+    177:186:void linkCatchSuccessors(java.util.List,java.util.List):981:990 -> a
+    187:218:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):994:1025 -> a
+    219:224:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLens):1036:1041 -> a
     225:225:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):352:352 -> a
-    225:225:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLens):1037 -> a
-    226:230:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLens):1038:1042 -> a
-    231:232:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.BasicBlock.readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1092:1093 -> a
-    231:232:boolean isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1099 -> a
-    233:251:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1130:1148 -> a
-    252:255:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1156:1159 -> a
-    256:259:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1158:1161 -> a
-    260:264:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1210:1214 -> a
-    265:272:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1227:1234 -> a
-    273:305:void print(com.android.tools.r8.utils.CfgPrinter):1333:1365 -> a
-    306:307:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1369:1370 -> a
-    308:309:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):1428:1429 -> a
-    310:314:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1442:1446 -> a
-    315:321:com.android.tools.r8.ir.code.BasicBlock createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.Instruction[]):1477:1483 -> a
-    322:331:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1499:1508 -> a
-    332:332:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):784:784 -> a
-    332:332:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1509 -> a
-    333:333:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):784:784 -> a
-    333:333:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1510 -> a
-    334:334:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1511:1511 -> a
+    225:225:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLens):1041 -> a
+    226:230:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLens):1042:1046 -> a
+    231:232:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.BasicBlock.readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1096:1097 -> a
+    231:232:boolean isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1103 -> a
+    233:251:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1134:1152 -> a
+    252:255:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1160:1163 -> a
+    256:259:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1162:1165 -> a
+    260:264:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1214:1218 -> a
+    265:272:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1231:1238 -> a
+    273:305:void print(com.android.tools.r8.utils.CfgPrinter):1337:1369 -> a
+    306:307:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1373:1374 -> a
+    308:309:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):1432:1433 -> a
+    310:314:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1446:1450 -> a
+    315:321:com.android.tools.r8.ir.code.BasicBlock createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.Instruction[]):1481:1487 -> a
+    322:331:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1503:1512 -> a
+    332:332:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):788:788 -> a
+    332:332:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1513 -> a
+    333:333:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):788:788 -> a
+    333:333:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1514 -> a
+    334:334:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1515:1515 -> a
     335:335:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1172:1172 -> 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):1512 -> 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):1512:1512 -> a
-    337:338:boolean canThrow():1637:1638 -> a
-    339:339:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1686:1686 -> a
-    340:340:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.BasicBlock.listIterator(com.android.tools.r8.ir.code.IRMetadata):1690:1690 -> a
-    340:340:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1686 -> a
-    341:341:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1690:1690 -> a
-    342:342:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1694:1694 -> a
-    343:343:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1705:1705 -> a
-    344:355:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1723:1734 -> a
-    356:361:void com.android.tools.r8.ir.code.BasicBlock.moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1755:1760 -> a
-    356:361:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1738 -> a
-    362:366:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1742:1746 -> a
-    367:382:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1771:1786 -> a
-    383:384:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1806:1807 -> a
-    383:384:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1787 -> 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):1516 -> 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):1516:1516 -> a
+    337:338:boolean canThrow():1641:1642 -> a
+    339:339:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1690:1690 -> a
+    340:340:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.BasicBlock.listIterator(com.android.tools.r8.ir.code.IRMetadata):1694:1694 -> a
+    340:340:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1690 -> a
+    341:341:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1694:1694 -> a
+    342:342:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1698:1698 -> a
+    343:343:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1709:1709 -> a
+    344:355:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1727:1738 -> a
+    356:361:void com.android.tools.r8.ir.code.BasicBlock.moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1759:1764 -> a
+    356:361:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1742 -> a
+    362:366:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1746:1750 -> a
+    367:382:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1775:1790 -> a
+    383:384:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1810:1811 -> a
+    383:384:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1791 -> a
     385:385:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
-    385:385:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1807 -> a
-    385:385:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1787 -> a
-    386:403:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1811:1828 -> a
-    386:403:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1787 -> a
+    385:385:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1811 -> a
+    385:385:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1791 -> a
+    386:403:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1815:1832 -> a
+    386:403:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1791 -> a
     404:404:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1172:1172 -> a
-    404:404:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1829 -> a
-    404:404:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1787 -> a
-    405:411:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1829:1835 -> a
-    405: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):1787 -> a
-    412:412:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):784:784 -> a
-    412:412:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1836 -> 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):1787 -> a
-    413:416:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1837:1840 -> a
-    413:416:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1787 -> a
-    417:417:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):784:784 -> a
-    417:417:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1841 -> a
-    417:417:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1787 -> a
-    418:423:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1842:1847 -> a
-    418:423:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1787 -> a
-    424:424:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1825:1825 -> a
-    424:424:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1787 -> a
+    404:404:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1833 -> a
+    404:404:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1791 -> a
+    405:411:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1833:1839 -> a
+    405: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):1791 -> a
+    412:412:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):788:788 -> a
+    412:412:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1840 -> 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):1791 -> a
+    413:416:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1841:1844 -> a
+    413:416:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1791 -> a
+    417:417:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):788:788 -> a
+    417:417:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1845 -> a
+    417:417:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1791 -> a
+    418:423:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1846:1851 -> a
+    418:423:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1791 -> a
+    424:424:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1829:1829 -> a
+    424:424:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1791 -> a
     425:425:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    425:425:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1825 -> a
-    425: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):1787 -> a
-    426:463:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1825:1862 -> a
-    426:463:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1787 -> a
-    464:537:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1878:1951 -> a
-    1:1:void setFilled():613:613 -> a0
-    1:1:void lambda$notifyPredecessorsMayChangeListeners$2(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):303:303 -> b
-    2:32:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):394:424 -> b
+    425:425:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1829 -> a
+    425: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):1791 -> a
+    426:463:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1829:1866 -> a
+    426:463:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1791 -> a
+    464:537:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1882:1955 -> a
+    1:1:void setFilled():617:617 -> a0
+    1:1:void lambda$notifyPredecessorsMayChangeListeners$2(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):307:307 -> b
+    2:32:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):398:428 -> b
     33:33:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> b
-    33:33:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):426 -> b
-    34:34:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):426:426 -> b
+    33:33:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):430 -> b
+    34:34:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):430:430 -> b
     35:35:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> b
-    35:35:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):427 -> b
-    36:39:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):427:430 -> b
+    35:35:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):431 -> b
+    36:39:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):431:434 -> b
     40:40:boolean com.android.tools.r8.ir.code.Instruction.isLoad():0:0 -> b
-    40:40:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):430 -> b
-    41:42:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):430:431 -> b
-    43:47:boolean com.android.tools.r8.ir.code.BasicBlock.hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):493:497 -> b
-    43:47:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):431 -> b
-    48:101:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):431:484 -> b
-    102:102:java.lang.Iterable instructionsBefore(com.android.tools.r8.ir.code.Instruction):656:656 -> b
-    103:104:void decrementUnfilledPredecessorCount(int):758:759 -> b
-    105:106:void removePhi(com.android.tools.r8.ir.code.Phi):778:779 -> b
-    107:107:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):882:882 -> b
-    108:112:boolean com.android.tools.r8.ir.code.BasicBlock.isCatchHandlerForSingleGuard():908:912 -> b
-    108:112:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):883 -> b
-    113:117:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):885:889 -> b
-    118:145:java.util.Set cleanForRemoval():943:970 -> b
-    146:147:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.BasicBlock.readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1092:1093 -> b
-    146:147:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1105 -> b
-    148:150:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1107:1109 -> b
-    151:152:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1181:1182 -> b
-    153:165:void removeInstructions(java.util.List):1391:1403 -> b
-    166:166:void com.android.tools.r8.ir.code.BasicBlock.setInstructions(java.util.LinkedList):1383:1383 -> b
-    166:166:void removeInstructions(java.util.List):1404 -> b
-    1:1:void setFilledForTesting():617:617 -> b0
-    1:1:void lambda$notifySuccessorsMayChangeListeners$1(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):240:240 -> c
-    2:6:void swapSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):364:368 -> c
-    7:8:void removePhisByIndex(java.util.List):582:583 -> c
-    9:10:boolean isMarked(int):748:749 -> c
-    11:14:boolean hasCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1186:1189 -> c
-    15:24:boolean isInstructionBeforeThrowingInstruction(com.android.tools.r8.ir.code.Instruction):1517:1526 -> c
-    25:25:void clearCatchHandlers():1614:1614 -> c
-    1:1:int size():694:694 -> c0
-    1:2:boolean hasNormalSuccessor(com.android.tools.r8.ir.code.BasicBlock):252:253 -> d
-    3:5:void clearCurrentDefinitions():1078:1080 -> d
-    6:6:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1678:1678 -> d
-    7:7:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1682:1682 -> d
-    1:9:java.lang.String toDetailedString():1259:1267 -> d0
-    10:10:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():609:609 -> d0
-    10:10:java.lang.String toDetailedString():1267 -> d0
-    11:12:java.lang.String toDetailedString():1267:1268 -> d0
-    13:13:boolean com.android.tools.r8.ir.code.BasicBlock.isSealed():1206:1206 -> d0
-    13:13:java.lang.String toDetailedString():1268 -> d0
-    14:51:java.lang.String toDetailedString():1268:1305 -> d0
-    52:52:int com.android.tools.r8.ir.code.BasicBlock.digits(int):1255:1255 -> d0
-    52:52:java.lang.String toDetailedString():1305 -> d0
-    53:77:java.lang.String toDetailedString():1305:1329 -> d0
-    1:2:void clearUserInfo():724:725 -> e
-    3:6:void mark(int):735:738 -> e
-    7:8:void lambda$blocksClean$5(com.android.tools.r8.ir.code.BasicBlock):816:817 -> e
-    9:9:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1682:1682 -> e
-    9:9:java.util.Iterator lambda$instructionsAfter$3(com.android.tools.r8.ir.code.Instruction):652 -> e
-    1:3:void unlinkCatchHandler():867:869 -> e0
-    1:2:int numberInstructions(int):640:641 -> f
-    3:3:java.util.Iterator lambda$instructionsBefore$4(com.android.tools.r8.ir.code.Instruction):657:657 -> f
-    4:5:boolean consistentCatchHandlers():1049:1050 -> f
-    6:6:com.android.tools.r8.ir.code.CatchHandlers com.android.tools.r8.ir.code.BasicBlock.getCatchHandlersWithSuccessorIndexes():1610:1610 -> f
-    6:6:boolean consistentCatchHandlers():1051 -> f
-    7:9:boolean consistentCatchHandlers():1053:1053 -> f
-    12:28:boolean consistentCatchHandlers():1056:1072 -> f
-    29:29:java.lang.String lambda$toDetailedString$7(com.android.tools.r8.ir.code.BasicBlock):1271:1271 -> f
-    1:5:com.android.tools.r8.ir.code.BasicBlock unlinkSinglePredecessor():828:832 -> f0
+    40:40:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):434 -> b
+    41:42:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):434:435 -> b
+    43:47:boolean com.android.tools.r8.ir.code.BasicBlock.hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):497:501 -> b
+    43:47:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):435 -> b
+    48:101:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):435:488 -> b
+    102:102:java.lang.Iterable instructionsBefore(com.android.tools.r8.ir.code.Instruction):660:660 -> b
+    103:104:void decrementUnfilledPredecessorCount(int):762:763 -> b
+    105:106:void removePhi(com.android.tools.r8.ir.code.Phi):782:783 -> b
+    107:107:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):886:886 -> b
+    108:112:boolean com.android.tools.r8.ir.code.BasicBlock.isCatchHandlerForSingleGuard():912:916 -> b
+    108:112:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):887 -> b
+    113:117:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):889:893 -> b
+    118:145:java.util.Set cleanForRemoval():947:974 -> b
+    146:147:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.BasicBlock.readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1096:1097 -> b
+    146:147:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1109 -> b
+    148:150:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1111:1113 -> b
+    151:152:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1185:1186 -> b
+    153:165:void removeInstructions(java.util.List):1395:1407 -> b
+    166:166:void com.android.tools.r8.ir.code.BasicBlock.setInstructions(java.util.LinkedList):1387:1387 -> b
+    166:166:void removeInstructions(java.util.List):1408 -> b
+    1:1:void setFilledForTesting():621:621 -> b0
+    1:1:void lambda$notifySuccessorsMayChangeListeners$1(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):244:244 -> c
+    2:6:void swapSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):368:372 -> c
+    7:8:void removePhisByIndex(java.util.List):586:587 -> c
+    9:10:boolean isMarked(int):752:753 -> c
+    11:14:boolean hasCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1190:1193 -> c
+    15:24:boolean isInstructionBeforeThrowingInstruction(com.android.tools.r8.ir.code.Instruction):1521:1530 -> c
+    25:25:void clearCatchHandlers():1618:1618 -> c
+    1:1:int size():698:698 -> c0
+    1:2:boolean hasNormalSuccessor(com.android.tools.r8.ir.code.BasicBlock):256:257 -> d
+    3:5:void clearCurrentDefinitions():1082:1084 -> d
+    6:6:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1682:1682 -> d
+    7:7:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1686:1686 -> d
+    1:9:java.lang.String toDetailedString():1263:1271 -> d0
+    10:10:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():613:613 -> d0
+    10:10:java.lang.String toDetailedString():1271 -> d0
+    11:12:java.lang.String toDetailedString():1271:1272 -> d0
+    13:13:boolean com.android.tools.r8.ir.code.BasicBlock.isSealed():1210:1210 -> d0
+    13:13:java.lang.String toDetailedString():1272 -> d0
+    14:51:java.lang.String toDetailedString():1272:1309 -> d0
+    52:52:int com.android.tools.r8.ir.code.BasicBlock.digits(int):1259:1259 -> d0
+    52:52:java.lang.String toDetailedString():1309 -> d0
+    53:77:java.lang.String toDetailedString():1309:1333 -> d0
+    1:2:void clearUserInfo():728:729 -> e
+    3:6:void mark(int):739:742 -> e
+    7:8:void lambda$blocksClean$5(com.android.tools.r8.ir.code.BasicBlock):820:821 -> e
+    9:9:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1686:1686 -> e
+    9:9:java.util.Iterator lambda$instructionsAfter$3(com.android.tools.r8.ir.code.Instruction):656 -> e
+    1:3:void unlinkCatchHandler():871:873 -> e0
+    1:2:int numberInstructions(int):644:645 -> f
+    3:3:java.util.Iterator lambda$instructionsBefore$4(com.android.tools.r8.ir.code.Instruction):661:661 -> f
+    4:5:boolean consistentCatchHandlers():1053:1054 -> f
+    6:6:com.android.tools.r8.ir.code.CatchHandlers com.android.tools.r8.ir.code.BasicBlock.getCatchHandlersWithSuccessorIndexes():1614:1614 -> f
+    6:6:boolean consistentCatchHandlers():1055 -> f
+    7:9:boolean consistentCatchHandlers():1057:1057 -> f
+    12:28:boolean consistentCatchHandlers():1060:1076 -> f
+    29:29:java.lang.String lambda$toDetailedString$7(com.android.tools.r8.ir.code.BasicBlock):1275:1275 -> f
+    1:5:com.android.tools.r8.ir.code.BasicBlock unlinkSinglePredecessor():832:836 -> f0
     int onThrowValueRegister(int) -> g
-    1:2:void decrementUnfilledPredecessorCount():763:764 -> g
-    3:6:void link(com.android.tools.r8.ir.code.BasicBlock):807:810 -> g
-    7:9:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1412:1414 -> g
-    1:5:void unlinkSinglePredecessorSiblingsAllowed():838:842 -> g0
-    1:2:void setNumber(int):631:632 -> h
-    3:4:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1248:1249 -> h
-    5:13:int com.android.tools.r8.ir.code.BasicBlock.guardsForCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1193:1201 -> h
-    5:13:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1249 -> h
-    14:16:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1249:1251 -> h
-    17:51:void deduplicatePhis():2004:2038 -> h
-    1:6:com.android.tools.r8.ir.code.BasicBlock unlinkSingleSuccessor():851:856 -> h0
-    1:3:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):319:321 -> i
+    1:2:void decrementUnfilledPredecessorCount():767:768 -> g
+    3:6:void link(com.android.tools.r8.ir.code.BasicBlock):811:814 -> g
+    7:9:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1416:1418 -> g
+    1:5:void unlinkSinglePredecessorSiblingsAllowed():842:846 -> g0
+    1:2:void setNumber(int):635:636 -> h
+    3:4:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1252:1253 -> h
+    5:13:int com.android.tools.r8.ir.code.BasicBlock.guardsForCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1197:1205 -> h
+    5:13:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1253 -> h
+    14:16:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1253:1255 -> h
+    17:51:void deduplicatePhis():2008:2042 -> h
+    1:6:com.android.tools.r8.ir.code.BasicBlock unlinkSingleSuccessor():855:860 -> h0
+    1:3:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):323:325 -> i
     4:4:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> i
-    4:4:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):321 -> i
-    5:5:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):321:321 -> i
-    6:9:void detachAllSuccessors():921:924 -> i
-    10:11:boolean verifyOnThrowWrite(int):1650:1651 -> i
-    1:2:boolean verifyFilledPredecessors():768:769 -> i0
-    1:3:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1558:1560 -> j
-    4:5:void transferCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1618:1619 -> j
-    1:1:com.android.tools.r8.ir.code.Instruction entry():702:702 -> k
-    1:2:com.android.tools.r8.ir.code.Instruction exceptionalExit():712:713 -> l
-    3:3:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(int):1678:1678 -> l
-    3:3:com.android.tools.r8.ir.code.Instruction exceptionalExit():713 -> l
-    4:6:com.android.tools.r8.ir.code.Instruction exceptionalExit():714:716 -> l
-    1:3:com.android.tools.r8.ir.code.JumpInstruction exit():706:708 -> m
-    1:5:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlers():1602:1606 -> n
-    1:1:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1610:1610 -> o
-    1:1:java.util.LinkedList getInstructions():648:648 -> p
+    4:4:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):325 -> i
+    5:5:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):325:325 -> i
+    6:9:void detachAllSuccessors():925:928 -> i
+    10:11:boolean verifyOnThrowWrite(int):1654:1655 -> i
+    1:2:boolean verifyFilledPredecessors():772:773 -> i0
+    1:3:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1562:1564 -> j
+    4:5:void transferCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1622:1623 -> j
+    1:1:com.android.tools.r8.ir.code.Instruction entry():706:706 -> k
+    1:2:com.android.tools.r8.ir.code.Instruction exceptionalExit():716:717 -> l
+    3:3:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(int):1682:1682 -> l
+    3:3:com.android.tools.r8.ir.code.Instruction exceptionalExit():717 -> l
+    4:6:com.android.tools.r8.ir.code.Instruction exceptionalExit():718:720 -> l
+    1:3:com.android.tools.r8.ir.code.JumpInstruction exit():710:712 -> m
+    1:5:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlers():1606:1610 -> n
+    1:1:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1614:1614 -> o
+    1:1:java.util.LinkedList getInstructions():652:652 -> p
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getLocalsAtEntry():110:110 -> q
-    1:2:java.util.List getMutablePredecessors():297:298 -> r
-    1:2:java.util.List getMutableSuccessors():234:235 -> s
-    1:7:java.util.List getNormalPredecessors():309:315 -> t
-    1:1:java.lang.String toString():1240:1240 -> toString
-    1:5:java.util.List getNormalSuccessors():261:265 -> u
-    6:7:void com.android.tools.r8.ir.code.BasicBlock.forEachNormalSuccessor(java.util.function.Consumer):246:247 -> u
-    6:7:java.util.List getNormalSuccessors():265 -> u
-    8:8:java.util.List getNormalSuccessors():266:266 -> u
-    1:2:int getNumber():626:627 -> v
-    1:1:java.lang.String getNumberAsString():636:636 -> w
-    1:1:java.util.List getPhis():601:601 -> x
-    1:1:java.util.List getPredecessors():293:293 -> y
-    1:1:java.util.List getSuccessors():230:230 -> z
-com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.internal.YA0:
+    1:2:java.util.List getMutablePredecessors():301:302 -> r
+    1:2:java.util.List getMutableSuccessors():238:239 -> s
+    1:7:java.util.List getNormalPredecessors():313:319 -> t
+    1:1:java.lang.String toString():1244:1244 -> toString
+    1:5:java.util.List getNormalSuccessors():265:269 -> u
+    6:7:void com.android.tools.r8.ir.code.BasicBlock.forEachNormalSuccessor(java.util.function.Consumer):250:251 -> u
+    6:7:java.util.List getNormalSuccessors():269 -> u
+    8:8:java.util.List getNormalSuccessors():270:270 -> u
+    1:2:int getNumber():630:631 -> v
+    1:1:java.lang.String getNumberAsString():640:640 -> w
+    1:1:java.util.List getPhis():605:605 -> x
+    1:1:java.util.List getPredecessors():297:297 -> y
+    1:1:java.util.List getSuccessors():234:234 -> z
+com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.internal.bB0:
     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.InstructionIterator iterator -> a
-    1:4:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):657:660 -> <init>
-    1:1:boolean hasNext():674:674 -> hasNext
-    1:3:com.android.tools.r8.ir.code.Instruction advance():663:665 -> l
-    1:5:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock$1.next():679:683 -> next
-    1:5:java.lang.Object next():657 -> next
-    6:6:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock$1.next():681:681 -> next
-    6:6:java.lang.Object next():657 -> next
-com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.internal.ZA0:
-com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.internal.aB0:
+    1:4:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):661:664 -> <init>
+    1:1:boolean hasNext():678:678 -> hasNext
+    1:3:com.android.tools.r8.ir.code.Instruction advance():667:669 -> l
+    1:5:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock$1.next():683:687 -> next
+    1:5:java.lang.Object next():661 -> next
+    6:6:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock$1.next():685:685 -> next
+    6:6:java.lang.Object next():661 -> next
+com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.internal.cB0:
+com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.internal.dB0:
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NORMAL -> b
     com.android.tools.r8.ir.code.BasicBlock$EdgeType EXCEPTIONAL -> c
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NON_EDGE -> a
-    1:3:void <clinit>():129:131 -> <clinit>
-    1:1:void <init>(java.lang.String,int):128:128 -> <init>
-com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.internal.bB0:
+    1:3:void <clinit>():133:135 -> <clinit>
+    1:1:void <init>(java.lang.String,int):132:132 -> <init>
+com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.internal.eB0:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():1981:1981 -> <clinit>
-    1:1:void <init>():1981:1981 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.BasicBlock$1):1981:1981 -> <init>
-    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):1981:1981 -> a
-    2:4:boolean com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence.doEquivalent(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi):1984:1986 -> a
-    2:4:boolean doEquivalent(java.lang.Object,java.lang.Object):1981 -> a
-    5:5:int doHash(java.lang.Object):1981:1981 -> a
-    6:7:int com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence.doHash(com.android.tools.r8.ir.code.Phi):1996:1997 -> a
-    6:7:int doHash(java.lang.Object):1981 -> a
-com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.cB0:
+    1:1:void <clinit>():1985:1985 -> <clinit>
+    1:1:void <init>():1985:1985 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.BasicBlock$1):1985:1985 -> <init>
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):1985:1985 -> a
+    2:4:boolean com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence.doEquivalent(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi):1988:1990 -> a
+    2:4:boolean doEquivalent(java.lang.Object,java.lang.Object):1985 -> a
+    5:5:int doHash(java.lang.Object):1985:1985 -> a
+    6:7:int com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence.doHash(com.android.tools.r8.ir.code.Phi):2000:2001 -> a
+    6:7:int doHash(java.lang.Object):1985 -> a
+com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.fB0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     1:1:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo.defaultForConstString(com.android.tools.r8.utils.InternalOptions):124 -> a
-com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.internal.fB0:
+com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.internal.iB0:
     java.util.ListIterator instructionIterator -> a
     1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):13:14 -> <init>
     3:4:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):17:18 -> <init>
@@ -72189,7 +72230,7 @@ com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.
     1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlockInstructionIterator.next():43:43 -> next
     1:1:java.lang.Object next():9 -> next
     1:1:com.android.tools.r8.ir.code.Instruction previous():33:33 -> previous
-com.android.tools.r8.ir.code.BasicBlockInstructionListIterator -> com.android.tools.r8.internal.gB0:
+com.android.tools.r8.ir.code.BasicBlockInstructionListIterator -> com.android.tools.r8.internal.jB0:
     com.android.tools.r8.ir.code.IRMetadata metadata -> e
     java.util.ListIterator listIterator -> b
     com.android.tools.r8.ir.code.Instruction current -> c
@@ -72269,7 +72310,7 @@ com.android.tools.r8.ir.code.BasicBlockInstructionListIterator -> com.android.to
     298:298:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():67:67 -> a
     298:298:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):579 -> a
     299:302:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):579:582 -> a
-    303:303:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1594:1594 -> a
+    303:303:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
     303:303:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):582 -> a
     304:304:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):586:586 -> a
     305:305:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1172:1172 -> a
@@ -72331,7 +72372,7 @@ com.android.tools.r8.ir.code.BasicBlockInstructionListIterator -> com.android.to
     641:641:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement):1130:1130 -> a
     641:641:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):252 -> a
     642:645:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):254:257 -> a
-    646:646:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1594:1594 -> a
+    646:646:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
     646:646:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):257 -> a
     647:652:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):259:264 -> a
     1:1:void add(java.lang.Object):38:38 -> add
@@ -72369,7 +72410,7 @@ com.android.tools.r8.ir.code.BasicBlockInstructionListIterator -> com.android.to
     1:1:void set(java.lang.Object):38:38 -> set
     2:5:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):161:164 -> set
     2:5:void set(java.lang.Object):38 -> set
-com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.internal.iB0:
+com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.internal.lB0:
     java.util.ListIterator listIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> a
     com.android.tools.r8.ir.code.BasicBlock current -> c
@@ -72391,7 +72432,7 @@ com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.internal
     1:1:void set(java.lang.Object):10:10 -> set
     2:2:void com.android.tools.r8.ir.code.BasicBlockIterator.set(com.android.tools.r8.ir.code.BasicBlock):73:73 -> set
     2:2:void set(java.lang.Object):10 -> set
-com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.internal.CB0:
+com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.internal.FB0:
     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>
     boolean hasInvariantOutType() -> P0
@@ -72422,7 +72463,7 @@ com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.internal.CB0:
     1:2:int maxInOutValueRegisterSize():82:83 -> k2
     1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> l2
     com.android.tools.r8.ir.code.Binop asBinop() -> r
-com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.internal.QC0:
+com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.internal.TC0:
     java.util.Map canonicalPositions -> b
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.code.Position callerPosition -> a
@@ -72443,7 +72484,7 @@ com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.internal
     27:27:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):103 -> a
     28:37:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):104:113 -> a
     1:1:com.android.tools.r8.ir.code.Position getCanonical(com.android.tools.r8.ir.code.Position):55:55 -> b
-com.android.tools.r8.ir.code.CatchHandlers -> com.android.tools.r8.internal.TC0:
+com.android.tools.r8.ir.code.CatchHandlers -> com.android.tools.r8.internal.WC0:
     java.util.List targets -> b
     java.util.List guards -> a
     java.util.Set uniqueTargets -> c
@@ -72473,18 +72514,18 @@ com.android.tools.r8.ir.code.CatchHandlers -> com.android.tools.r8.internal.TC0:
     1:1:boolean isEmpty():55:55 -> isEmpty
     1:1:java.util.Iterator iterator():111:111 -> iterator
     1:2:int size():59:60 -> size
-com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.internal.RC0:
+com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.internal.UC0:
     com.android.tools.r8.ir.code.CatchHandlers this$0 -> b
     int nextIndex -> a
     1:3:void <init>(com.android.tools.r8.ir.code.CatchHandlers):111:113 -> <init>
     1:1:boolean hasNext():117:117 -> hasNext
     1:4:com.android.tools.r8.ir.code.CatchHandlers$CatchHandler com.android.tools.r8.ir.code.CatchHandlers$1.next():122:125 -> next
     1:4:java.lang.Object next():111 -> next
-com.android.tools.r8.ir.code.CatchHandlers$CatchHandler -> com.android.tools.r8.internal.SC0:
+com.android.tools.r8.ir.code.CatchHandlers$CatchHandler -> com.android.tools.r8.internal.VC0:
     java.lang.Object target -> b
     com.android.tools.r8.graph.DexType guard -> a
     1:3:void <init>(com.android.tools.r8.graph.DexType,java.lang.Object):24:26 -> <init>
-com.android.tools.r8.ir.code.CheckCast -> com.android.tools.r8.internal.PF0:
+com.android.tools.r8.ir.code.CheckCast -> com.android.tools.r8.internal.SF0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType type -> h
     1:1:void <clinit>():30:30 -> <clinit>
@@ -72527,7 +72568,7 @@ com.android.tools.r8.ir.code.CheckCast -> com.android.tools.r8.internal.PF0:
     boolean isCheckCast() -> j1
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> s
     1:1:java.lang.String toString():184:184 -> toString
-com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.internal.YH0:
+com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.internal.bI0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Cmp$Bias bias -> i
     1:1:void <clinit>():26:26 -> <clinit>
@@ -72581,12 +72622,12 @@ com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.internal.YH0:
     1:17:java.lang.String toString():104:120 -> toString
     18:19:java.lang.String toString():113:114 -> toString
     20:42:java.lang.String toString():109:131 -> toString
-com.android.tools.r8.ir.code.Cmp$1 -> com.android.tools.r8.internal.WH0:
+com.android.tools.r8.ir.code.Cmp$1 -> com.android.tools.r8.internal.ZH0:
     int[] $SwitchMap$com$android$tools$r8$ir$code$Cmp$Bias -> b
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():90:90 -> <clinit>
     2:2:void <clinit>():60:60 -> <clinit>
-com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.internal.XH0:
+com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.internal.aI0:
     com.android.tools.r8.ir.code.Cmp$Bias LT -> c
     com.android.tools.r8.ir.code.Cmp$Bias NONE -> a
     com.android.tools.r8.ir.code.Cmp$Bias GT -> b
@@ -72595,7 +72636,7 @@ com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.internal.XH0:
     2:2:void <clinit>():28:28 -> <clinit>
     1:1:void <init>(java.lang.String,int):28:28 -> <init>
     1:1:com.android.tools.r8.ir.code.Cmp$Bias[] values():28:28 -> a
-com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.internal.pJ0:
+com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.internal.sJ0:
     com.android.tools.r8.graph.DexType clazz -> i
     boolean $assertionsDisabled -> j
     int $r8$clinit -> k
@@ -72637,7 +72678,7 @@ com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.internal.pJ0:
     1:1:com.android.tools.r8.graph.DexType getValue():69:69 -> i2
     1:1:java.lang.String toString():91:91 -> toString
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> u
-com.android.tools.r8.ir.code.ConstClass$Builder -> com.android.tools.r8.internal.oJ0:
+com.android.tools.r8.ir.code.ConstClass$Builder -> com.android.tools.r8.internal.rJ0:
     com.android.tools.r8.graph.DexType type -> c
     1:1:void <init>():201:201 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
@@ -72645,7 +72686,7 @@ com.android.tools.r8.ir.code.ConstClass$Builder -> com.android.tools.r8.internal
     1:1:com.android.tools.r8.ir.code.ConstClass build():212:212 -> b
     2:3:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.Instruction$BuilderBase.amend(com.android.tools.r8.ir.code.Instruction):1604:1605 -> b
     2:3:com.android.tools.r8.ir.code.ConstClass build():212 -> b
-com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.internal.qJ0:
+com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.internal.tJ0:
     int $r8$clinit -> h
     1:1:void <init>(com.android.tools.r8.ir.code.Value):33:33 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> K0
@@ -72656,7 +72697,7 @@ com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.internal.q
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     boolean isConstInstruction() -> l1
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> v
-com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.internal.sJ0:
+com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.internal.vJ0:
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():21:21 -> <clinit>
@@ -72689,7 +72730,7 @@ com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.internal.
     1:1:com.android.tools.r8.graph.DexMethodHandle getValue():55:55 -> h2
     1:1:java.lang.String toString():93:93 -> toString
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> w
-com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.internal.tJ0:
+com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.internal.wJ0:
     com.android.tools.r8.graph.DexProto methodType -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():21:21 -> <clinit>
@@ -72721,7 +72762,7 @@ com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.internal.tJ
     int opcode() -> d2
     1:1:java.lang.String toString():87:87 -> toString
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> x
-com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.internal.vJ0:
+com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.internal.yJ0:
     long value -> i
     boolean $assertionsDisabled -> j
     int $r8$clinit -> k
@@ -72792,10 +72833,10 @@ com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.internal.vJ0:
     1:1:boolean negativeIs8Bit():284:284 -> t2
     1:4:java.lang.String toString():260:263 -> toString
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> y
-com.android.tools.r8.ir.code.ConstNumber$1 -> com.android.tools.r8.internal.uJ0:
+com.android.tools.r8.ir.code.ConstNumber$1 -> com.android.tools.r8.internal.xJ0:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():188:188 -> <clinit>
-com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.internal.xJ0:
+com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.internal.AJ0:
     boolean $assertionsDisabled -> j
     int $r8$clinit -> k
     com.android.tools.r8.graph.DexString value -> i
@@ -72814,7 +72855,7 @@ com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.internal.xJ0:
     6:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71 -> a
     7:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:72 -> a
     9:9:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):134:134 -> a
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     10:10:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):134 -> a
     11:14:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):134:137 -> a
     15:15:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):135:135 -> a
@@ -72834,7 +72875,7 @@ com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.internal.xJ0:
     1:1:com.android.tools.r8.graph.DexString getValue():61:61 -> h2
     1:1:java.lang.String toString():93:93 -> toString
     com.android.tools.r8.ir.code.ConstString asConstString() -> z
-com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.internal.FJ0:
+com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.internal.IJ0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:6:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):20:25 -> a
@@ -72855,7 +72896,7 @@ com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.internal
     37:37:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
     37:37:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):55 -> a
     38:38:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):56:56 -> a
-com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.internal.gK0:
+com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.internal.jK0:
     1:1:void <init>():20:20 -> <init>
     boolean hasInvariantOutType() -> P0
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -72873,11 +72914,11 @@ com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.internal.gK0
     1:1:int maxOutValueRegister():65:65 -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     int opcode() -> d2
-com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.internal.hK0:
+com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.internal.kK0:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
     boolean isAllowedAfterThrowingInstruction() -> Z0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):26:26 -> a
-com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.internal.iK0:
+com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.internal.lK0:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():27:27 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):30:31 -> <init>
@@ -72891,7 +72932,7 @@ com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.internal.iK
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):56:56 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalWrite():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):56 -> b
-com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.internal.jK0:
+com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.internal.mK0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap starting -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap ending -> h
@@ -72925,7 +72966,7 @@ com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.internal.
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():44:44 -> h2
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():48:48 -> i2
     1:6:java.lang.String toString():93:98 -> toString
-com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.internal.kK0:
+com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.internal.nK0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():20:20 -> <init>
@@ -72947,7 +72988,7 @@ com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.internal.kK0:
     1:1:int maxOutValueRegister():61:61 -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     int opcode() -> d2
-com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration -> com.android.tools.r8.internal.lK0:
+com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration -> com.android.tools.r8.internal.oK0:
     com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():7:9 -> <clinit>
@@ -72960,13 +73001,13 @@ com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration -> com.android.too
     1:1:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):20:20 -> b
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
     2:2:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):20 -> b
-com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.internal.uK0:
+com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.internal.xK0:
     1:1:void <init>():7:7 -> <init>
     java.lang.Object handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction) -> a
     java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke) -> a
     java.lang.Object com.android.tools.r8.ir.code.InstructionVisitor.visit(com.android.tools.r8.ir.code.NewInstance) -> a
     java.lang.Object com.android.tools.r8.ir.code.InstructionVisitor.visit(com.android.tools.r8.ir.code.NewUnboxedEnumInstance) -> a
-com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.internal.OL0:
+com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.internal.RL0:
     int $r8$clinit -> l
     com.android.tools.r8.graph.DexReference item -> i
     boolean $assertionsDisabled -> k
@@ -73003,7 +73044,7 @@ com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.int
     1:1:com.android.tools.r8.graph.DexReference getItem():59:59 -> h2
     1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():63:63 -> i2
     1:1:java.lang.String toString():109:109 -> toString
-com.android.tools.r8.ir.code.Div -> com.android.tools.r8.internal.EM0:
+com.android.tools.r8.ir.code.Div -> com.android.tools.r8.internal.HM0:
     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>
     com.android.tools.r8.ir.code.Div asDiv() -> D
     1:1:boolean instructionTypeCanThrow():134:134 -> X0
@@ -73033,7 +73074,7 @@ com.android.tools.r8.ir.code.Div -> com.android.tools.r8.internal.EM0:
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
     boolean isCommutative() -> i2
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> m2
-com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.internal.HM0:
+com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.internal.KM0:
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> a
     com.android.tools.r8.ir.code.BasicBlock[] doms -> b
     boolean obsolete -> e
@@ -73065,7 +73106,7 @@ com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.internal.HM0:
     5:5:void onSuccessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):328:328 -> c
     1:2:void numberBlocks():240:241 -> d
     1:9:java.lang.String toString():308:316 -> toString
-com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.internal.FM0:
+com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.internal.IM0:
     com.android.tools.r8.ir.code.DominatorTree this$0 -> b
     boolean $assertionsDisabled -> c
     com.android.tools.r8.ir.code.BasicBlock current -> a
@@ -73074,11 +73115,11 @@ com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.internal.FM
     1:1:boolean hasNext():201:201 -> hasNext
     1:9:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.DominatorTree$1.next():206:214 -> next
     1:9:java.lang.Object next():196 -> next
-com.android.tools.r8.ir.code.DominatorTree$Inclusive -> com.android.tools.r8.internal.GM0:
+com.android.tools.r8.ir.code.DominatorTree$Inclusive -> com.android.tools.r8.internal.JM0:
     com.android.tools.r8.ir.code.DominatorTree$Inclusive NO -> a
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):23:23 -> <init>
-com.android.tools.r8.ir.code.Dup -> com.android.tools.r8.internal.RM0:
+com.android.tools.r8.ir.code.Dup -> com.android.tools.r8.internal.UM0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):21:21 -> <init>
@@ -73109,7 +73150,7 @@ com.android.tools.r8.ir.code.Dup -> com.android.tools.r8.internal.RM0:
     1:1:com.android.tools.r8.ir.code.StackValue outTop():57 -> i2
     2:2:com.android.tools.r8.ir.code.StackValue outTop():57:57 -> i2
     1:1:com.android.tools.r8.ir.code.StackValue src():61:61 -> j2
-com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.internal.QM0:
+com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.internal.TM0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):28:28 -> <init>
@@ -73132,7 +73173,7 @@ com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.internal.QM0:
     1:3:com.android.tools.r8.ir.code.Value setOutValue(com.android.tools.r8.ir.code.Value):55:57 -> e
     4:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.setOutValue(com.android.tools.r8.ir.code.Value):158:161 -> e
     4:7:com.android.tools.r8.ir.code.Value setOutValue(com.android.tools.r8.ir.code.Value):59 -> e
-com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.internal.TO0:
+com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.internal.WO0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexField field -> h
     1:1:void <clinit>():26:26 -> <clinit>
@@ -73141,7 +73182,7 @@ com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.internal.T
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> F
     boolean hasInvariantOutType() -> P0
     1:1:boolean internalInstructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult):82:82 -> a
-    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> a
+    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> a
     2:2:boolean internalInstructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult):84 -> a
     3:10:boolean internalInstructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult):84:91 -> a
     11:11:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
@@ -73160,7 +73201,7 @@ com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.internal.T
     1:1:com.android.tools.r8.ir.code.FieldMemberType getType():43:43 -> i2
     com.android.tools.r8.ir.code.Value value() -> j2
     boolean isFieldInstruction() -> t1
-com.android.tools.r8.ir.code.FieldMemberType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.UO0:
+com.android.tools.r8.ir.code.FieldMemberType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.XO0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
@@ -73170,7 +73211,7 @@ com.android.tools.r8.ir.code.FieldMemberType$EnumUnboxingLocalUtility -> com.and
     2:2:com.android.tools.r8.ir.code.FieldMemberType com.android.tools.r8.ir.code.FieldMemberType.fromDexType(com.android.tools.r8.graph.DexType):51 -> a
     3:3:com.android.tools.r8.ir.code.FieldMemberType com.android.tools.r8.ir.code.FieldMemberType.fromTypeDescriptorChar(char):44:44 -> a
     3:3:com.android.tools.r8.ir.code.FieldMemberType com.android.tools.r8.ir.code.FieldMemberType.fromDexType(com.android.tools.r8.graph.DexType):51 -> a
-com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.internal.rP0:
+com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.internal.uP0:
     boolean $assertionsDisabled -> r
     int register -> q
     1:1:void <clinit>():12:12 -> <clinit>
@@ -73194,7 +73235,7 @@ com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.internal
     22:23:com.android.tools.r8.ir.code.ValueType outType():43:44 -> e0
     1:1:int getRegister():50:50 -> k0
     1:1:java.lang.String toString():75:75 -> toString
-com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.internal.TQ0:
+com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.internal.WQ0:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -73212,7 +73253,7 @@ com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.internal.TQ0:
     1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():40:43 -> i2
     1:4:java.lang.String toString():75:78 -> toString
     boolean isGoto() -> v1
-com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.internal.TR0:
+com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.internal.WR0:
     boolean $assertionsDisabled -> l
     boolean numbered -> f
     int nextInstructionNumber -> g
@@ -73518,7 +73559,7 @@ com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.internal.TR0:
     1:1:com.android.tools.r8.ir.code.BasicBlock entryBlock():164:164 -> j
     1:1:int getCurrentBlockNumber():1176:1176 -> k
     1:1:com.android.tools.r8.ir.code.Argument getLastArgument():1106:1106 -> l
-    2:2:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(int):1678:1678 -> l
+    2:2:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(int):1682:1682 -> l
     2:2:com.android.tools.r8.ir.code.Argument getLastArgument():1106 -> l
     3:5:com.android.tools.r8.ir.code.Argument getLastArgument():1107:1109 -> l
     1:1:int getNextInstructionNumber():1075:1075 -> m
@@ -73575,10 +73616,10 @@ com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.internal.TR0:
     1:1:com.android.tools.r8.graph.DexEncodedMethod method():160:160 -> x
     1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():1057:1059 -> y
     1:7:int numberRemainingInstructions():1065:1071 -> z
-com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.internal.RR0:
+com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.internal.UR0:
     com.android.tools.r8.ir.code.BasicBlock block -> a
     1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):100:101 -> <init>
-com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.internal.SR0:
+com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.internal.VR0:
     java.util.Deque liveStackValues -> c
     java.util.Set liveLocalValues -> b
     java.util.LinkedHashSet liveValues -> a
@@ -73587,7 +73628,7 @@ com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.inte
     1:5:void <init>(java.util.LinkedHashSet,java.util.Set,java.util.Deque):73:77 -> <init>
     1:2:boolean equals(java.lang.Object):87:88 -> equals
     1:1:int hashCode():82:82 -> hashCode
-com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.internal.UR0:
+com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.internal.XR0:
     java.util.ListIterator blockIterator -> a
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> c
@@ -73602,7 +73643,7 @@ com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.i
     10:10:java.lang.Object next():10 -> next
     1:10:com.android.tools.r8.ir.code.Instruction previous():48:57 -> previous
     11:11:com.android.tools.r8.ir.code.Instruction previous():52:52 -> previous
-com.android.tools.r8.ir.code.IRCodeInstructionListIterator -> com.android.tools.r8.internal.VR0:
+com.android.tools.r8.ir.code.IRCodeInstructionListIterator -> com.android.tools.r8.internal.YR0:
     java.util.ListIterator blockIterator -> a
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> c
@@ -73647,7 +73688,7 @@ com.android.tools.r8.ir.code.IRCodeInstructionListIterator -> com.android.tools.
     1:1:void set(java.lang.Object):22:22 -> set
     2:2:void com.android.tools.r8.ir.code.IRCodeInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):205:205 -> set
     2:2:void set(java.lang.Object):22 -> set
-com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.internal.XR0:
+com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.internal.aS0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:7:com.android.tools.r8.ir.code.InvokeDirect getUniqueConstructorInvoke(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):24:30 -> a
@@ -73665,7 +73706,7 @@ com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.internal.XR0:
     75:78:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):148:151 -> a
     1:1:void removeInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):114:114 -> b
     2:2:void removeInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):113:113 -> b
-com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.internal.YR0:
+com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.internal.bS0:
     long second -> b
     long first -> a
     boolean $assertionsDisabled -> c
@@ -73785,7 +73826,7 @@ com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.internal.YR0:
     1:1:boolean mayHaveInvokeSuper():202:202 -> x
     1:1:boolean mayHaveInvokeVirtual():206:206 -> y
     1:1:boolean mayHaveMonitorInstruction():210:210 -> z
-com.android.tools.r8.ir.code.If -> com.android.tools.r8.internal.mS0:
+com.android.tools.r8.ir.code.If -> com.android.tools.r8.internal.pS0:
     boolean $assertionsDisabled -> j
     int $r8$clinit -> k
     com.android.tools.r8.ir.code.If$Type type -> i
@@ -73833,10 +73874,10 @@ com.android.tools.r8.ir.code.If -> com.android.tools.r8.internal.mS0:
     1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNullObject():228:230 -> p2
     1:8:java.lang.String toString():169:176 -> toString
     boolean isIf() -> w1
-com.android.tools.r8.ir.code.If$1 -> com.android.tools.r8.internal.lS0:
+com.android.tools.r8.ir.code.If$1 -> com.android.tools.r8.internal.oS0:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():27:27 -> <clinit>
-com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.internal.mS0$a:
+com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.internal.pS0$a:
     com.android.tools.r8.ir.code.If$Type GT -> c
     com.android.tools.r8.ir.code.If$Type LE -> d
     com.android.tools.r8.ir.code.If$Type EQ -> a
@@ -73859,10 +73900,10 @@ com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.internal.mS0$a:
     19:27:com.android.tools.r8.ir.code.If$Type inverted():49:57 -> b
     28:28:com.android.tools.r8.ir.code.If$Type inverted():47:47 -> b
     1:1:com.android.tools.r8.ir.code.If$Type[] values():22:22 -> c
-com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.internal.jT0:
+com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.internal.mT0:
     void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver) -> a
     com.android.tools.r8.ir.code.MemberType getMemberType() -> b
-com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.internal.nT0:
+com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.internal.qT0:
     boolean $assertionsDisabled -> i
     int increment -> h
     1:1:void <clinit>():20:20 -> <clinit>
@@ -73878,7 +73919,7 @@ com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.internal.nT0:
     int maxOutValueRegister() -> c2
     int opcode() -> d2
     1:1:java.lang.String toString():102:102 -> toString
-com.android.tools.r8.ir.code.InitClass -> com.android.tools.r8.internal.vT0:
+com.android.tools.r8.ir.code.InitClass -> com.android.tools.r8.internal.yT0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType clazz -> h
     1:1:void <clinit>():26:26 -> <clinit>
@@ -73906,8 +73947,8 @@ com.android.tools.r8.ir.code.InitClass -> com.android.tools.r8.internal.vT0:
     1:1:com.android.tools.r8.ir.code.InitClass$Builder builder():39:39 -> h2
     1:1:com.android.tools.r8.graph.DexType getClassValue():43:43 -> i2
     1:1:java.lang.String toString():171:171 -> toString
-com.android.tools.r8.ir.code.InitClass$1 -> com.android.tools.r8.internal.tT0:
-com.android.tools.r8.ir.code.InitClass$Builder -> com.android.tools.r8.internal.uT0:
+com.android.tools.r8.ir.code.InitClass$1 -> com.android.tools.r8.internal.wT0:
+com.android.tools.r8.ir.code.InitClass$Builder -> com.android.tools.r8.internal.xT0:
     com.android.tools.r8.graph.DexType type -> c
     1:1:void <init>(com.android.tools.r8.ir.code.InitClass$1):174:174 -> <init>
     2:2:void <init>():178:178 -> <init>
@@ -73916,9 +73957,9 @@ com.android.tools.r8.ir.code.InitClass$Builder -> com.android.tools.r8.internal.
     1:1:com.android.tools.r8.ir.code.InitClass build():187:187 -> b
     2:3:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.Instruction$BuilderBase.amend(com.android.tools.r8.ir.code.Instruction):1604:1605 -> b
     2:3:com.android.tools.r8.ir.code.InitClass build():187 -> b
-com.android.tools.r8.ir.code.InstanceFieldInstruction -> com.android.tools.r8.internal.bU0:
+com.android.tools.r8.ir.code.InstanceFieldInstruction -> com.android.tools.r8.internal.eU0:
     com.android.tools.r8.ir.code.Value object() -> c
-com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.internal.eU0:
+com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.internal.hU0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):38:38 -> <init>
@@ -73959,7 +74000,7 @@ com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.internal.eU0:
     boolean throwsOnNullInput() -> g2
     1:1:com.android.tools.r8.ir.code.Value value():68:68 -> j2
     1:1:java.lang.String toString():172:172 -> toString
-com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.internal.nU0:
+com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.internal.qU0:
     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):25:26 -> <init>
     com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> L
@@ -73984,7 +74025,7 @@ com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.internal.nU0:
     1:1:com.android.tools.r8.graph.DexType type():40:40 -> h2
     1:1:com.android.tools.r8.ir.code.Value value():48:48 -> i2
     1:2:java.lang.String toString():127:128 -> toString
-com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.internal.oU0:
+com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.internal.rU0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):38:38 -> <init>
@@ -74021,7 +74062,7 @@ com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.internal.oU0:
     1:1:com.android.tools.r8.ir.code.Value value():74:74 -> j2
     1:1:java.lang.String toString():214:214 -> toString
     boolean isInstanceFieldInstruction() -> y1
-com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.internal.yU0:
+com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.internal.BU0:
     java.util.List inValues -> b
     java.util.Set debugValues -> e
     int number -> d
@@ -74313,7 +74354,7 @@ com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.internal.yU0:
     com.android.tools.r8.ir.code.ConstString asConstString() -> z
     com.android.tools.r8.ir.code.Throw asThrow() -> z0
     boolean isInstanceGet() -> z1
-com.android.tools.r8.ir.code.Instruction$BuilderBase -> com.android.tools.r8.internal.rU0:
+com.android.tools.r8.ir.code.Instruction$BuilderBase -> com.android.tools.r8.internal.uU0:
     com.android.tools.r8.ir.code.Position position -> b
     com.android.tools.r8.ir.code.Value outValue -> a
     1:1:void <init>():1594:1594 -> <init>
@@ -74331,7 +74372,7 @@ com.android.tools.r8.ir.code.Instruction$BuilderBase -> com.android.tools.r8.int
     11:11:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Instruction):1629:1629 -> a
     12:13:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Position):1624:1625 -> a
     12:13:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Instruction):1629 -> a
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption -> com.android.tools.r8.internal.xU0:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption -> com.android.tools.r8.internal.AU0:
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption NONE -> a
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption CLASS_ALREADY_INITIALIZED -> b
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption IGNORE_RECEIVER_FIELD_ASSIGNMENTS -> c
@@ -74343,26 +74384,26 @@ com.android.tools.r8.ir.code.Instruction$SideEffectAssumption -> com.android.too
     1:1:com.android.tools.r8.ir.code.Instruction$SideEffectAssumption join(com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):1571:1571 -> a
     boolean canAssumeInvokedMethodDoesNotHaveSideEffects() -> b
     boolean canAssumeReceiverIsNotNull() -> c
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$1 -> com.android.tools.r8.internal.sU0:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$1 -> com.android.tools.r8.internal.vU0:
     1:1:void <init>():1519:1519 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$2 -> com.android.tools.r8.internal.tU0:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$2 -> com.android.tools.r8.internal.wU0:
     1:1:void <init>():1528:1528 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$3 -> com.android.tools.r8.internal.uU0:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$3 -> com.android.tools.r8.internal.xU0:
     1:1:void <init>():1537:1537 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$4 -> com.android.tools.r8.internal.vU0:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$4 -> com.android.tools.r8.internal.yU0:
     1:1:void <init>():1546:1546 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$5 -> com.android.tools.r8.internal.wU0:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$5 -> com.android.tools.r8.internal.zU0:
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption val$other -> f
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption this$0 -> g
     1:1:void <init>(com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):1571:1571 -> <init>
     1:2:boolean canAssumeClassIsAlreadyInitialized():1575:1576 -> a
     1:2:boolean canAssumeInvokedMethodDoesNotHaveSideEffects():1581:1582 -> b
     1:2:boolean canAssumeReceiverIsNotNull():1587:1588 -> c
-com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.internal.AU0:
+com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.internal.DU0:
     1:3:com.android.tools.r8.ir.code.Instruction peekPrevious():45:47 -> e
     1:3:com.android.tools.r8.ir.code.Instruction peekNext():30:32 -> f
     1:1:void remove():15:15 -> remove
-com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.internal.BU0:
+com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.internal.EU0:
     void addThrowingInstructionToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.utils.InternalOptions) -> a
     com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement) -> a
@@ -74397,12 +74438,12 @@ com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.int
     void unsetInsertionPosition() -> h
     void removeOrReplaceByDebugLocalRead() -> i
     1:1:void removeInstructionIgnoreOutValue():67:67 -> k
-com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.internal.CU0:
+com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.internal.FU0:
     com.android.tools.r8.ir.code.BasicBlock getBlock() -> d
     boolean isPhi() -> e
     com.android.tools.r8.ir.code.Instruction asInstruction() -> g
     com.android.tools.r8.ir.code.Phi asPhi() -> h
-com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.internal.YW0:
+com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.internal.bX0:
     boolean $assertionsDisabled -> m
     int[] keys -> l
     1:1:void <clinit>():28:28 -> <clinit>
@@ -74468,7 +74509,7 @@ com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.internal.YW0:
     5:5:int com.android.tools.r8.ir.code.IntSwitch.getKey(int):212:212 -> toString
     5:5:java.lang.String toString():274 -> toString
     6:11:java.lang.String toString():274:279 -> toString
-com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.internal.NX0:
+com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.internal.QX0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):130:130 -> <init>
@@ -74568,7 +74609,7 @@ com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.internal.NX0:
     1:1:int requiredArgumentRegisters():200:200 -> o2
     2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():262:262 -> o2
     2:2:int requiredArgumentRegisters():201 -> o2
-com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.internal.MX0:
+com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.internal.PX0:
     com.android.tools.r8.ir.code.Invoke$Type SUPER -> f
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.code.Invoke$Type VIRTUAL -> g
@@ -74593,7 +74634,7 @@ com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.internal.MX0:
     1:2:int getDexOpcodeRange():82:83 -> c
     1:1:boolean isInterface():91:91 -> d
     1:1:boolean isVirtual():103:103 -> e
-com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.internal.OX0:
+com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.internal.RX0:
     com.android.tools.r8.graph.DexCallSite callSite -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():26:26 -> <clinit>
@@ -74642,7 +74683,7 @@ com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.internal.OX0:
     1:1:java.lang.String getTypeString():116:116 -> m2
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():106:106 -> p2
     1:1:java.lang.String toString():121:121 -> toString
-com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.internal.QX0:
+com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.internal.TX0:
     boolean $assertionsDisabled -> m
     boolean isInterface -> l
     1:1:void <clinit>():33:33 -> <clinit>
@@ -74673,7 +74714,7 @@ com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.internal.QX0:
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():66:66 -> l2
     1:1:java.lang.String getTypeString():71:71 -> m2
     1:1:boolean getInterfaceBit():56:56 -> p2
-com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.internal.SX0:
+com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.internal.VX0:
     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>
@@ -74695,7 +74736,7 @@ com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.internal.SX
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():52:52 -> l2
     1:1:java.lang.String getTypeString():57:57 -> m2
     boolean getInterfaceBit() -> p2
-com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.internal.UX0:
+com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.internal.XX0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexMethod method -> i
     1:1:void <clinit>():40:40 -> <clinit>
@@ -74748,14 +74789,14 @@ com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.internal.UX0:
     boolean getInterfaceBit() -> p2
     1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():57:57 -> q2
     1:1:java.lang.String toString():67:67 -> toString
-com.android.tools.r8.ir.code.InvokeMethod$Builder -> com.android.tools.r8.internal.TX0:
+com.android.tools.r8.ir.code.InvokeMethod$Builder -> com.android.tools.r8.internal.WX0:
     java.util.List arguments -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexMethod method -> c
     1:1:void <clinit>():247:247 -> <clinit>
     1:5:void <init>():247:251 -> <init>
     1:3:com.android.tools.r8.ir.code.InvokeMethod$Builder setArguments(java.util.List):254:256 -> a
-com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.internal.VX0:
+com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.internal.YX0:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):33:33 -> <init>
@@ -74795,7 +74836,7 @@ com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.in
     1:1:java.lang.Iterable getNonReceiverArguments():37 -> r2
     2:2:java.lang.Iterable getNonReceiverArguments():37:37 -> r2
     1:2:com.android.tools.r8.ir.code.Value getReceiver():63:64 -> s2
-com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.internal.WX0:
+com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.internal.ZX0:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():25:25 -> <clinit>
@@ -74831,7 +74872,7 @@ com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.interna
     1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():177:177 -> q2
     1:1:boolean instructionInstanceCanThrowNegativeArraySizeException():162 -> q2
     2:8:boolean instructionInstanceCanThrowNegativeArraySizeException():162:168 -> q2
-com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.internal.XX0:
+com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.internal.aY0:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():25:25 -> <clinit>
@@ -74863,7 +74904,7 @@ com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.internal.XX0
     1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():139:139 -> p2
     1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> q2
     1:1:java.lang.String toString():65:65 -> toString
-com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.internal.YX0:
+com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.internal.bY0:
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexProto proto -> k
     1:1:void <clinit>():29:29 -> <clinit>
@@ -74898,7 +74939,7 @@ com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.internal.
     1:1:java.lang.String getTypeString():65:65 -> m2
     boolean getInterfaceBit() -> p2
     1:1:com.android.tools.r8.graph.DexProto getProto():69:69 -> r2
-com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.internal.dY0:
+com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.internal.gY0:
     int $r8$clinit -> m
     boolean isInterface -> k
     boolean $assertionsDisabled -> l
@@ -74933,7 +74974,7 @@ com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.internal.dY0:
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():67:67 -> l2
     1:1:java.lang.String getTypeString():72:72 -> m2
     1:1:boolean getInterfaceBit():52:52 -> p2
-com.android.tools.r8.ir.code.InvokeStatic$Builder -> com.android.tools.r8.internal.cY0:
+com.android.tools.r8.ir.code.InvokeStatic$Builder -> com.android.tools.r8.internal.fY0:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():236:236 -> <clinit>
     1:1:void <init>():236:236 -> <init>
@@ -74954,7 +74995,7 @@ com.android.tools.r8.ir.code.InvokeStatic$Builder -> com.android.tools.r8.intern
     1:5:com.android.tools.r8.ir.code.InvokeStatic build():240:244 -> b
     6:7:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.Instruction$BuilderBase.amend(com.android.tools.r8.ir.code.Instruction):1604:1605 -> b
     6:7:com.android.tools.r8.ir.code.InvokeStatic build():244 -> b
-com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.internal.eY0:
+com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.internal.hY0:
     boolean $assertionsDisabled -> m
     boolean isInterface -> l
     1:1:void <clinit>():26:26 -> <clinit>
@@ -74977,7 +75018,7 @@ com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.internal.eY0:
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():52:52 -> l2
     1:1:java.lang.String getTypeString():57:57 -> m2
     1:1:boolean getInterfaceBit():37:37 -> p2
-com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.internal.hY0:
+com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.internal.kY0:
     int $r8$clinit -> m
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():30:30 -> <clinit>
@@ -75005,7 +75046,7 @@ com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.internal.hY0:
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():57:57 -> l2
     1:1:java.lang.String getTypeString():62:62 -> m2
     boolean getInterfaceBit() -> p2
-com.android.tools.r8.ir.code.InvokeVirtual$Builder -> com.android.tools.r8.internal.gY0:
+com.android.tools.r8.ir.code.InvokeVirtual$Builder -> com.android.tools.r8.internal.jY0:
     1:1:void <init>():175:175 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:1:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexMethod):269:269 -> a
@@ -75014,7 +75055,7 @@ com.android.tools.r8.ir.code.InvokeVirtual$Builder -> com.android.tools.r8.inter
     1:1:com.android.tools.r8.ir.code.InvokeVirtual build():179:179 -> b
     2:3:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.Instruction$BuilderBase.amend(com.android.tools.r8.ir.code.Instruction):1604:1605 -> b
     2:3:com.android.tools.r8.ir.code.InvokeVirtual build():179 -> b
-com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.internal.bZ0:
+com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.internal.eZ0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():16:16 -> <init>
@@ -75030,13 +75071,13 @@ com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.internal.bZ
     1:1:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):32:32 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> h2
-com.android.tools.r8.ir.code.LazyDominatorTree -> com.android.tools.r8.internal.q41:
+com.android.tools.r8.ir.code.LazyDominatorTree -> com.android.tools.r8.internal.t41:
     com.android.tools.r8.ir.code.IRCode code -> b
     1:2:void <init>(com.android.tools.r8.ir.code.IRCode):13:14 -> <init>
     1:1:java.lang.Object get():9:9 -> a
     1:1:com.android.tools.r8.ir.code.DominatorTree get():19:19 -> c
     1:1:com.android.tools.r8.ir.code.DominatorTree lambda$get$0():19:19 -> d
-com.android.tools.r8.ir.code.LinearFlowInstructionListIterator -> com.android.tools.r8.internal.X41:
+com.android.tools.r8.ir.code.LinearFlowInstructionListIterator -> com.android.tools.r8.internal.a51:
     java.util.Set seenBlocks -> d
     com.android.tools.r8.ir.code.IRCode code -> a
     com.android.tools.r8.ir.code.InstructionListIterator currentBlockIterator -> c
@@ -75081,7 +75122,7 @@ com.android.tools.r8.ir.code.LinearFlowInstructionListIterator -> com.android.to
     1:1:void set(java.lang.Object):21:21 -> set
     2:2:void com.android.tools.r8.ir.code.LinearFlowInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):266:266 -> set
     2:2:void set(java.lang.Object):21 -> set
-com.android.tools.r8.ir.code.Load -> com.android.tools.r8.internal.u51:
+com.android.tools.r8.ir.code.Load -> com.android.tools.r8.internal.x51:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):23:23 -> <init>
     boolean hasInvariantOutType() -> P0
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -75102,7 +75143,7 @@ com.android.tools.r8.ir.code.Load -> com.android.tools.r8.internal.u51:
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     int opcode() -> d2
     1:1:com.android.tools.r8.ir.code.Value src():37:37 -> h2
-com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.internal.I51:
+com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.internal.L51:
     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>
@@ -75135,10 +75176,10 @@ com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.internal.I51:
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> c0
     com.android.tools.r8.code.Instruction CreateLong(int,int,int) -> d
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> m2
-com.android.tools.r8.ir.code.LogicalBinop$1 -> com.android.tools.r8.internal.H51:
+com.android.tools.r8.ir.code.LogicalBinop$1 -> com.android.tools.r8.internal.K51:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():65:65 -> <clinit>
-com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.internal.a71:
+com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.internal.d71:
     com.android.tools.r8.ir.code.MemberType CHAR -> c
     com.android.tools.r8.ir.code.MemberType BOOLEAN_OR_BYTE -> b
     com.android.tools.r8.ir.code.MemberType INT -> e
@@ -75170,7 +75211,7 @@ com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.internal.a71:
     28:28:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.fromTypeDescriptorChar(char):82:82 -> a
     28:28:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
     1:1:com.android.tools.r8.ir.code.MemberType[] values():11:11 -> b
-com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.internal.y81:
+com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.internal.B81:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.Monitor$Type type -> h
     1:1:void <clinit>():21:21 -> <clinit>
@@ -75202,10 +75243,10 @@ com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.internal.y81:
     int opcode() -> d2
     boolean throwsOnNullInput() -> g2
     1:1:boolean isEnter():49:49 -> h2
-com.android.tools.r8.ir.code.Monitor$1 -> com.android.tools.r8.internal.w81:
+com.android.tools.r8.ir.code.Monitor$1 -> com.android.tools.r8.internal.z81:
     int[] $SwitchMap$com$android$tools$r8$ir$code$Monitor$Type -> a
     1:1:void <clinit>():118:118 -> <clinit>
-com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.internal.x81:
+com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.internal.A81:
     com.android.tools.r8.ir.code.Monitor$Type ENTER -> a
     com.android.tools.r8.ir.code.Monitor$Type[] $VALUES -> c
     com.android.tools.r8.ir.code.Monitor$Type EXIT -> b
@@ -75213,7 +75254,7 @@ com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.internal.x81:
     2:2:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(java.lang.String,int):23:23 -> <init>
     1:1:com.android.tools.r8.ir.code.Monitor$Type[] values():23:23 -> a
-com.android.tools.r8.ir.code.Move -> com.android.tools.r8.internal.A81:
+com.android.tools.r8.ir.code.Move -> com.android.tools.r8.internal.D81:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
@@ -75243,7 +75284,7 @@ com.android.tools.r8.ir.code.Move -> com.android.tools.r8.internal.A81:
     1:1:com.android.tools.r8.ir.code.Value dest():38:38 -> h2
     1:1:com.android.tools.r8.ir.code.Value src():42:42 -> i2
     1:1:java.lang.String toString():77:77 -> toString
-com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.internal.C81:
+com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.internal.F81:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType exceptionType -> h
     com.android.tools.r8.utils.InternalOptions options -> i
@@ -75256,7 +75297,7 @@ com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.internal.C81:
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47 -> a
     3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47:48 -> a
     5:7:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):85:87 -> a
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     8:8:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):88 -> a
     9:9:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):91:91 -> a
     10:10:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):89:89 -> a
@@ -75279,7 +75320,7 @@ com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.internal.C81:
     int opcode() -> d2
     com.android.tools.r8.ir.code.MoveException asMoveException() -> f0
     1:1:com.android.tools.r8.graph.DexType getExceptionType():126:126 -> h2
-com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.internal.E81:
+com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.internal.H81:
     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>
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
@@ -75304,7 +75345,7 @@ com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.internal.E81:
     com.android.tools.r8.ir.code.Mul asMul() -> g0
     boolean isCommutative() -> i2
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> m2
-com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.internal.t91:
+com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.internal.w91:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
@@ -75328,10 +75369,10 @@ com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.internal.t91:
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> b
     int opcode() -> d2
     com.android.tools.r8.ir.code.Neg asNeg() -> h0
-com.android.tools.r8.ir.code.Neg$1 -> com.android.tools.r8.internal.s91:
+com.android.tools.r8.ir.code.Neg$1 -> com.android.tools.r8.internal.v91:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():57:57 -> <clinit>
-com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.internal.D91:
+com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.internal.G91:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType type -> h
     1:1:void <clinit>():22:22 -> <clinit>
@@ -75362,7 +75403,7 @@ com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.internal.D91:
     1:1:com.android.tools.r8.ir.code.Value size():51:51 -> h2
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> i0
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.internal.E91:
+com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.internal.H91:
     long size -> i
     short[] data -> j
     int element_width -> h
@@ -75393,7 +75434,7 @@ com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.internal
     int opcode() -> d2
     1:1:com.android.tools.r8.ir.code.Value src():46:46 -> h2
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> j0
-com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.internal.F91:
+com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.internal.I91:
     boolean allowSpilling -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType clazz -> h
@@ -75429,7 +75470,7 @@ com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.internal.F91:
     1:1:void markNoSpilling():203:203 -> j2
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> k0
     1:1:java.lang.String toString():71:71 -> toString
-com.android.tools.r8.ir.code.NewUnboxedEnumInstance -> com.android.tools.r8.internal.G91:
+com.android.tools.r8.ir.code.NewUnboxedEnumInstance -> com.android.tools.r8.internal.J91:
     boolean $assertionsDisabled -> j
     int ordinal -> i
     com.android.tools.r8.graph.DexType clazz -> h
@@ -75458,9 +75499,9 @@ com.android.tools.r8.ir.code.NewUnboxedEnumInstance -> com.android.tools.r8.inte
     1:1:int getOrdinal():54:54 -> h2
     com.android.tools.r8.ir.code.NewUnboxedEnumInstance asNewUnboxedEnumInstance() -> l0
     1:1:java.lang.String toString():79:79 -> toString
-com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.internal.H91:
+com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.internal.K91:
     1:3:java.lang.Object nextUntil(java.util.function.Predicate):19:21 -> a
-com.android.tools.r8.ir.code.Not -> com.android.tools.r8.internal.ya1:
+com.android.tools.r8.ir.code.Not -> com.android.tools.r8.internal.Ba1:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():19:19 -> <clinit>
@@ -75483,10 +75524,10 @@ com.android.tools.r8.ir.code.Not -> com.android.tools.r8.internal.ya1:
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> b
     int opcode() -> d2
     com.android.tools.r8.ir.code.Not asNot() -> m0
-com.android.tools.r8.ir.code.Not$1 -> com.android.tools.r8.internal.xa1:
+com.android.tools.r8.ir.code.Not$1 -> com.android.tools.r8.internal.Aa1:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():68:68 -> <clinit>
-com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.internal.Ga1:
+com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.internal.Ja1:
     com.android.tools.r8.ir.code.NumericType to -> i
     com.android.tools.r8.ir.code.NumericType from -> h
     1:3:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):36:38 -> <init>
@@ -75516,15 +75557,15 @@ com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.internal.G
     1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):138:142 -> b
     int opcode() -> d2
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> n0
-com.android.tools.r8.ir.code.NumberConversion$1 -> com.android.tools.r8.internal.Fa1:
+com.android.tools.r8.ir.code.NumberConversion$1 -> com.android.tools.r8.internal.Ia1:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():62:62 -> <clinit>
-com.android.tools.r8.ir.code.NumberGenerator -> com.android.tools.r8.internal.La1:
+com.android.tools.r8.ir.code.NumberGenerator -> com.android.tools.r8.internal.Oa1:
     int nextValueNumber -> a
     1:2:void <init>():6:7 -> <init>
     1:1:int next():10:10 -> a
     1:1:int peek():14:14 -> b
-com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.internal.Ra1:
+com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.internal.Ua1:
     com.android.tools.r8.ir.code.NumericType DOUBLE -> g
     com.android.tools.r8.ir.code.NumericType FLOAT -> f
     com.android.tools.r8.ir.code.NumericType LONG -> e
@@ -75551,10 +75592,10 @@ com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.internal.Ra1:
     53:59:com.android.tools.r8.ir.code.NumericType fromDexType(com.android.tools.r8.graph.DexType):45:51 -> a
     60:60:boolean isWide():62:62 -> a
     1:1:com.android.tools.r8.ir.code.NumericType[] values():10:10 -> b
-com.android.tools.r8.ir.code.NumericType$1 -> com.android.tools.r8.internal.Qa1:
+com.android.tools.r8.ir.code.NumericType$1 -> com.android.tools.r8.internal.Ta1:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():20:20 -> <clinit>
-com.android.tools.r8.ir.code.Or -> com.android.tools.r8.internal.Dd1:
+com.android.tools.r8.ir.code.Or -> com.android.tools.r8.internal.Gd1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -75574,7 +75615,7 @@ com.android.tools.r8.ir.code.Or -> com.android.tools.r8.internal.Dd1:
     boolean isCommutative() -> i2
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> m2
     com.android.tools.r8.ir.code.Or asOr() -> o0
-com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.internal.qe1:
+com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.internal.te1:
     java.util.List operands -> r
     java.util.List definitionUsers -> u
     boolean $assertionsDisabled -> v
@@ -75636,7 +75677,7 @@ com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.internal.qe1:
     133:133:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):402 -> a
     134:142:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):402:410 -> a
     boolean isDefinedByInstructionSatisfying(java.util.function.Predicate) -> b
-    1:2:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):33:34 -> b
+    1:2:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):38:39 -> b
     1:2:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):425 -> b
     3:24:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):426:447 -> b
     25:27:void abortOnInvalidDebugInfo(com.android.tools.r8.ir.code.ValueTypeConstraint):96:98 -> b
@@ -75661,18 +75702,18 @@ com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.internal.qe1:
     5:5:void removeDeadPhi():324 -> o0
     6:6:void removeDeadPhi():324:324 -> o0
     1:1:boolean removeTrivialPhi():240:240 -> p0
-com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.internal.qe1$a:
+com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.internal.te1$a:
     com.android.tools.r8.ir.code.Phi$RegisterReadType NORMAL -> a
     com.android.tools.r8.ir.code.Phi$RegisterReadType DEBUG -> b
     1:2:void <clinit>():39:40 -> <clinit>
     1:1:void <init>(java.lang.String,int):38:38 -> <init>
-com.android.tools.r8.ir.code.Phi$StackMapPhi -> com.android.tools.r8.internal.re1:
+com.android.tools.r8.ir.code.Phi$StackMapPhi -> com.android.tools.r8.internal.ue1:
     boolean $assertionsDisabled -> w
     1:1:void <clinit>():455:455 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Phi$RegisterReadType):463:463 -> <init>
     1:8:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):468:475 -> a
     1:10:com.android.tools.r8.ir.analysis.type.TypeElement computePhiType(com.android.tools.r8.graph.AppView):481:490 -> d
-com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.internal.Be1:
+com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.internal.Ee1:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():17:17 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value):20:21 -> <init>
@@ -75696,7 +75737,7 @@ com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.internal.Be1:
     1:1:int maxOutValueRegister():66:66 -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     int opcode() -> d2
-com.android.tools.r8.ir.code.Position -> com.android.tools.r8.internal.Ce1:
+com.android.tools.r8.ir.code.Position -> com.android.tools.r8.internal.Fe1:
     com.android.tools.r8.ir.code.Position TESTING_POSITION -> h
     com.android.tools.r8.ir.code.Position NO_POSITION_SYNTHETIC -> g
     com.android.tools.r8.graph.DexString file -> b
@@ -75737,7 +75778,7 @@ com.android.tools.r8.ir.code.Position -> com.android.tools.r8.internal.Ce1:
     com.android.tools.r8.utils.structural.StructuralItem self() -> q
     1:19:java.lang.String com.android.tools.r8.ir.code.Position.toString(boolean):171:189 -> toString
     1:19:java.lang.String toString():194 -> toString
-com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.internal.Sk1:
+com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.internal.Qk1:
     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>
     1:1:boolean instructionTypeCanThrow():134:134 -> X0
     double foldDouble(double,double) -> a
@@ -75767,7 +75808,7 @@ com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.internal.Sk1:
     boolean isCommutative() -> i2
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> m2
     com.android.tools.r8.ir.code.Rem asRem() -> p0
-com.android.tools.r8.ir.code.Return -> com.android.tools.r8.internal.Yl1:
+com.android.tools.r8.ir.code.Return -> com.android.tools.r8.internal.Wl1:
     boolean $assertionsDisabled -> i
     int $r8$clinit -> j
     1:1:void <clinit>():21:21 -> <clinit>
@@ -75793,19 +75834,19 @@ com.android.tools.r8.ir.code.Return -> com.android.tools.r8.internal.Yl1:
     1:1:boolean isReturnVoid():46:46 -> j2
     1:2:com.android.tools.r8.ir.code.Value returnValue():59:60 -> k2
     com.android.tools.r8.ir.code.Return asReturn() -> q0
-com.android.tools.r8.ir.code.Return$Builder -> com.android.tools.r8.internal.Xl1:
+com.android.tools.r8.ir.code.Return$Builder -> com.android.tools.r8.internal.Vl1:
     1:1:void <init>():138:138 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:1:com.android.tools.r8.ir.code.Return build():142:142 -> b
     2:3:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.Instruction$BuilderBase.amend(com.android.tools.r8.ir.code.Instruction):1604:1605 -> b
     2:3:com.android.tools.r8.ir.code.Return build():142 -> b
-com.android.tools.r8.ir.code.SafeCheckCast -> com.android.tools.r8.internal.qm1:
+com.android.tools.r8.ir.code.SafeCheckCast -> com.android.tools.r8.internal.im1:
     int $r8$clinit -> j
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):16:16 -> <init>
     1:1:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):25:25 -> a
     boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> b
     1:1:com.android.tools.r8.code.CheckCast createCheckCast(int):30:30 -> c
-com.android.tools.r8.ir.code.SafeCheckCast$Builder -> com.android.tools.r8.internal.pm1:
+com.android.tools.r8.ir.code.SafeCheckCast$Builder -> com.android.tools.r8.internal.hm1:
     com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.CheckCast$Builder.object -> d
     com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.CheckCast$Builder.castType -> c
     1:1:void com.android.tools.r8.ir.code.CheckCast$Builder.<init>():264:264 -> <init>
@@ -75821,7 +75862,7 @@ com.android.tools.r8.ir.code.SafeCheckCast$Builder -> com.android.tools.r8.inter
     4:4:com.android.tools.r8.ir.code.CheckCast$Builder com.android.tools.r8.ir.code.CheckCast$Builder.setObject(com.android.tools.r8.ir.code.Value):275:275 -> b
     4:4:com.android.tools.r8.ir.code.CheckCast$Builder com.android.tools.r8.ir.code.CheckCast$Builder.setObject(com.android.tools.r8.ir.code.Value):0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.internal.Sm1:
+com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.internal.Km1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -75841,7 +75882,7 @@ com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.internal.Sm1:
     boolean isCommutative() -> i2
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> m2
     com.android.tools.r8.ir.code.Shl asShl() -> r0
-com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.internal.Um1:
+com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.internal.Mm1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -75861,9 +75902,9 @@ com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.internal.Um1:
     boolean isCommutative() -> i2
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> m2
     com.android.tools.r8.ir.code.Shr asShr() -> s0
-com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.internal.hn1:
+com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.internal.Zm1:
     int decodedValue() -> a
-com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.internal.mo1:
+com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.internal.eo1:
     com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo typeInfo -> r
     boolean $assertionsDisabled -> s
     int height -> q
@@ -75876,7 +75917,7 @@ com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.internal.mo1:
     1:1:int getHeight():31:31 -> k0
     1:1:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo():35:35 -> l0
     1:1:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.internal.no1:
+com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.internal.fo1:
     com.android.tools.r8.ir.code.StackValue[] stackValues -> q
     boolean $assertionsDisabled -> r
     1:1:void <clinit>():14:14 -> <clinit>
@@ -75887,7 +75928,7 @@ com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.internal.no1:
     1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():25:25 -> k0
     1:10:java.lang.String toString():40:49 -> toString
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():59:59 -> y
-com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.internal.xo1:
+com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.internal.po1:
     boolean $assertionsDisabled -> j
     int $r8$clinit -> k
     1:1:void <clinit>():35:35 -> <clinit>
@@ -75933,7 +75974,7 @@ com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.internal.xo1:
     1:1:com.android.tools.r8.ir.code.Value dest():67:67 -> k2
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> t0
     1:1:java.lang.String toString():182:182 -> toString
-com.android.tools.r8.ir.code.StaticGet$Builder -> com.android.tools.r8.internal.wo1:
+com.android.tools.r8.ir.code.StaticGet$Builder -> com.android.tools.r8.internal.oo1:
     com.android.tools.r8.graph.DexField field -> c
     1:1:void <init>():252:252 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
@@ -75941,7 +75982,7 @@ com.android.tools.r8.ir.code.StaticGet$Builder -> com.android.tools.r8.internal.
     1:1:com.android.tools.r8.ir.code.StaticGet build():267:267 -> b
     2:3:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.Instruction$BuilderBase.amend(com.android.tools.r8.ir.code.Instruction):1604:1605 -> b
     2:3:com.android.tools.r8.ir.code.StaticGet build():267 -> b
-com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.internal.zo1:
+com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.internal.ro1:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):36:36 -> <init>
@@ -75973,7 +76014,7 @@ com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.internal.zo1:
     1:2:com.android.tools.r8.ir.code.Value value():51:52 -> j2
     1:1:java.lang.String toString():179:179 -> toString
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> u0
-com.android.tools.r8.ir.code.Store -> com.android.tools.r8.internal.Bo1:
+com.android.tools.r8.ir.code.Store -> com.android.tools.r8.internal.to1:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StackValue):25:25 -> <init>
@@ -75998,7 +76039,7 @@ com.android.tools.r8.ir.code.Store -> com.android.tools.r8.internal.Bo1:
     int opcode() -> d2
     1:1:com.android.tools.r8.ir.code.Value src():39:39 -> h2
     com.android.tools.r8.ir.code.Store asStore() -> v0
-com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.internal.bp1:
+com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.internal.To1:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexString[] keys -> l
     1:1:void <clinit>():17:17 -> <clinit>
@@ -76023,7 +76064,7 @@ com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.internal.bp1:
     5:5:java.lang.String toString():89 -> toString
     6:11:java.lang.String toString():89:94 -> toString
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> w0
-com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.internal.Cp1:
+com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.internal.up1:
     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>
@@ -76058,7 +76099,7 @@ com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.internal.Cp1:
     1:8:int maxInOutValueRegisterSize():131:138 -> k2
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> m2
     com.android.tools.r8.ir.code.Sub asSub() -> x0
-com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.internal.Np1:
+com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.internal.Fp1:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
@@ -76081,7 +76122,7 @@ com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.internal.Np1:
     1:3:com.android.tools.r8.ir.code.Value setOutValue(com.android.tools.r8.ir.code.Value):44:46 -> e
     4:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.setOutValue(com.android.tools.r8.ir.code.Value):158:161 -> e
     4:7:com.android.tools.r8.ir.code.Value setOutValue(com.android.tools.r8.ir.code.Value):48 -> e
-com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.internal.Op1:
+com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.internal.Gp1:
     int[] targetBlockIndices -> i
     int fallthroughBlockIndex -> j
     boolean $assertionsDisabled -> k
@@ -76107,7 +76148,7 @@ com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.internal.Op1:
     5:5:boolean valid():29:29 -> l2
     1:1:com.android.tools.r8.ir.code.Value value():24:24 -> m2
     com.android.tools.r8.ir.code.Switch asSwitch() -> y0
-com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.internal.rq1:
+com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.internal.jq1:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
@@ -76127,17 +76168,17 @@ com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.internal.rq1:
     int opcode() -> d2
     1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> i2
     com.android.tools.r8.ir.code.Throw asThrow() -> z0
-com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.internal.wr1:
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.internal.or1:
     com.android.tools.r8.ir.analysis.type.TypeElement getOutType() -> a
     1:1:com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier create(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):16:16 -> a
     com.android.tools.r8.graph.DebugLocalInfo getLocalInfo() -> f
-com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.internal.vr1:
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.internal.nr1:
     com.android.tools.r8.ir.analysis.type.TypeElement val$type -> b
     com.android.tools.r8.graph.DebugLocalInfo val$local -> a
     1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.analysis.type.TypeElement):16:16 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():25:25 -> a
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():20:20 -> f
-com.android.tools.r8.ir.code.UninitializedThisLocalRead -> com.android.tools.r8.internal.Rr1:
+com.android.tools.r8.ir.code.UninitializedThisLocalRead -> com.android.tools.r8.internal.Jr1:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):29:29 -> <init>
     boolean hasInvariantOutType() -> P0
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -76151,7 +76192,7 @@ com.android.tools.r8.ir.code.UninitializedThisLocalRead -> com.android.tools.r8.
     int maxOutValueRegister() -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     int opcode() -> d2
-com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.internal.gs1:
+com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.internal.Yr1:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     boolean hasInvariantOutType() -> P0
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):51:51 -> a
@@ -76164,7 +76205,7 @@ com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.internal.gs1:
     int maxOutValueRegister() -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:1:com.android.tools.r8.ir.code.Value source():25:25 -> h2
-com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.internal.us1:
+com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.internal.ns1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     com.android.tools.r8.ir.code.Ushr asUshr() -> A0
     int foldIntegers(int,int) -> a
@@ -76184,7 +76225,7 @@ com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.internal.us1:
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     boolean isCommutative() -> i2
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> m2
-com.android.tools.r8.ir.code.Value -> com.android.tools.r8.internal.Ds1:
+com.android.tools.r8.ir.code.Value -> com.android.tools.r8.internal.ws1:
     boolean $assertionsDisabled -> p
     int needsRegister -> j
     boolean isThis -> k
@@ -76421,14 +76462,14 @@ com.android.tools.r8.ir.code.Value -> com.android.tools.r8.internal.Ds1:
     1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():318 -> x
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():1085:1085 -> y
     1:11:com.android.tools.r8.utils.LongInterval getValueRange():951:961 -> z
-com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.internal.Bs1:
+com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.internal.us1:
     com.android.tools.r8.graph.DebugLocalInfo local -> a
     java.util.Set users -> b
     1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):158:158 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):156:159 -> <init>
-com.android.tools.r8.ir.code.ValueFactory -> com.android.tools.r8.internal.Es1:
+com.android.tools.r8.ir.code.ValueFactory -> com.android.tools.r8.internal.xs1:
     1:1:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement):13:13 -> a
-com.android.tools.r8.ir.code.ValueType -> com.android.tools.r8.internal.Ls1:
+com.android.tools.r8.ir.code.ValueType -> com.android.tools.r8.internal.Es1:
     com.android.tools.r8.ir.code.ValueType DOUBLE -> e
     com.android.tools.r8.ir.code.ValueType FLOAT -> c
     com.android.tools.r8.ir.code.ValueType LONG -> d
@@ -76480,14 +76521,14 @@ com.android.tools.r8.ir.code.ValueType -> com.android.tools.r8.internal.Ls1:
     1:1:com.android.tools.r8.ir.code.ValueType[] values():16:16 -> e
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():34:34 -> l
     com.android.tools.r8.utils.structural.StructuralItem self() -> q
-com.android.tools.r8.ir.code.ValueType$1 -> com.android.tools.r8.internal.Ks1:
+com.android.tools.r8.ir.code.ValueType$1 -> com.android.tools.r8.internal.Ds1:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> b
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> c
     int[] $SwitchMap$com$android$tools$r8$ir$code$MemberType -> a
     1:1:void <clinit>():142:142 -> <clinit>
     2:2:void <clinit>():105:105 -> <clinit>
     3:3:void <clinit>():54:54 -> <clinit>
-com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.internal.Ns1:
+com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.internal.Gs1:
     com.android.tools.r8.ir.code.ValueTypeConstraint FLOAT -> c
     com.android.tools.r8.ir.code.ValueTypeConstraint INT -> b
     com.android.tools.r8.ir.code.ValueTypeConstraint OBJECT -> a
@@ -76536,7 +76577,7 @@ com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.interna
     79:79:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeElement):137:137 -> a
     1:1:int requiredRegisters():42:42 -> b
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint[] values():13:13 -> c
-com.android.tools.r8.ir.code.ValueTypeConstraint$1 -> com.android.tools.r8.internal.Ms1:
+com.android.tools.r8.ir.code.ValueTypeConstraint$1 -> com.android.tools.r8.internal.Fs1:
     int[] $SwitchMap$com$android$tools$r8$ir$code$MemberType -> b
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> c
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueTypeConstraint -> d
@@ -76545,9 +76586,9 @@ com.android.tools.r8.ir.code.ValueTypeConstraint$1 -> com.android.tools.r8.inter
     2:2:void <clinit>():115:115 -> <clinit>
     3:3:void <clinit>():63:63 -> <clinit>
     4:4:void <clinit>():46:46 -> <clinit>
-com.android.tools.r8.ir.code.WideConstant -> com.android.tools.r8.internal.Ct1:
+com.android.tools.r8.ir.code.WideConstant -> com.android.tools.r8.internal.vt1:
     long decodedValue() -> a
-com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.internal.Ru1:
+com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.internal.Ku1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
     com.android.tools.r8.ir.code.Xor asXor() -> B0
     int foldIntegers(int,int) -> a
@@ -76567,7 +76608,7 @@ com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.internal.Ru1:
     int opcode() -> d2
     boolean isCommutative() -> i2
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> m2
-com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> com.android.tools.r8.internal.Pz0:
+com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> com.android.tools.r8.internal.Sz0:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
     boolean $assertionsDisabled -> c
@@ -76579,8 +76620,8 @@ com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> com.android
     19:19:void clear():63:63 -> a
     1:1:int getElementWidth(int):51:51 -> b
     1:1:long getSize(int):55:55 -> c
-com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$1 -> com.android.tools.r8.internal.Nz0:
-com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$PayloadData -> com.android.tools.r8.internal.Oz0:
+com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$1 -> com.android.tools.r8.internal.Qz0:
+com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$PayloadData -> com.android.tools.r8.internal.Rz0:
     long size -> b
     short[] data -> c
     int element_width -> a
@@ -76802,15 +76843,15 @@ com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$WorkItem
     com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$IteratorWorkItem asIterator() -> a
     com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$NodeWorkItem asNode() -> b
 com.android.tools.r8.ir.conversion.CallGraphBuilderBase$InvokeExtractor -> com.android.tools.r8.ir.conversion.j:
-    com.android.tools.r8.ir.conversion.CallGraphBuilderBase this$0 -> e
-    boolean $assertionsDisabled -> f
-    java.util.function.Predicate targetTester -> d
-    com.android.tools.r8.ir.conversion.CallGraph$Node currentMethod -> c
+    com.android.tools.r8.ir.conversion.CallGraphBuilderBase this$0 -> f
+    boolean $assertionsDisabled -> g
+    java.util.function.Predicate targetTester -> e
+    com.android.tools.r8.ir.conversion.CallGraph$Node currentMethod -> d
     1:1:void <clinit>():109:109 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.conversion.CallGraphBuilderBase,com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Predicate):114:117 -> <init>
     1:3:void addClassInitializerTarget(com.android.tools.r8.graph.DexProgramClass):121:123 -> a
     4:11:void addCallEdge(com.android.tools.r8.graph.ProgramMethod,boolean):136:143 -> a
-    12:12:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():481:481 -> a
+    12:12:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():423:423 -> a
     12:12:void addCallEdge(com.android.tools.r8.graph.ProgramMethod,boolean):143 -> a
     13:19:void addCallEdge(com.android.tools.r8.graph.ProgramMethod,boolean):147:153 -> a
     20:24:void addFieldReadEdge(com.android.tools.r8.graph.ProgramMethod):161:165 -> a
@@ -76856,7 +76897,7 @@ com.android.tools.r8.ir.conversion.CallGraphBuilderBase$InvokeExtractor -> com.a
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):353:353 -> g
     1:18:void processFieldRead(com.android.tools.r8.graph.DexField):258:275 -> i
     1:5:void processFieldWrite(com.android.tools.r8.graph.DexField):281:285 -> j
-com.android.tools.r8.ir.conversion.CallSiteInformation -> com.android.tools.r8.internal.MC0:
+com.android.tools.r8.ir.conversion.CallSiteInformation -> com.android.tools.r8.internal.PC0:
     1:1:void <init>():14:14 -> <init>
     boolean hasDoubleCallSite(com.android.tools.r8.graph.ProgramMethod) -> a
     boolean hasSingleCallSite(com.android.tools.r8.graph.ProgramMethod) -> b
@@ -76874,7 +76915,7 @@ com.android.tools.r8.ir.conversion.CallSiteInformation$EmptyCallSiteInformation
     boolean hasDoubleCallSite(com.android.tools.r8.graph.ProgramMethod) -> a
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation$EmptyCallSiteInformation access$000():32:32 -> a
     boolean hasSingleCallSite(com.android.tools.r8.graph.ProgramMethod) -> b
-com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.internal.dD0:
+com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.internal.gD0:
     com.android.tools.r8.ir.code.Position currentPosition -> h
     java.util.Map newInstanceLabels -> q
     java.util.List thisInitializers -> p
@@ -77042,7 +77083,7 @@ com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.internal.dD
     338:346:boolean com.android.tools.r8.ir.conversion.CfBuilder.verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):213:221 -> a
     338:346:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):185 -> a
     347:347:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):186:186 -> a
-    348:348:com.android.tools.r8.graph.CfCode$StackMapStatus com.android.tools.r8.graph.CfCode.verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):766:766 -> a
+    348:348:com.android.tools.r8.graph.CfCode$StackMapStatus com.android.tools.r8.graph.CfCode.verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):775:775 -> a
     348:348:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):186 -> a
     349:349:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):186:186 -> a
     350:356:java.util.List computeInitializers(com.android.tools.r8.ir.code.Value):256:262 -> a
@@ -77065,8 +77106,8 @@ com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.internal.dD
     21:26:void updateLocals(com.android.tools.r8.cf.code.CfLabel):556:561 -> b
     27:27:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.ir.code.BasicBlock):672:672 -> b
     28:28:int getLocalRegister(com.android.tools.r8.ir.code.Value):676:676 -> b
-com.android.tools.r8.ir.conversion.CfBuilder$1 -> com.android.tools.r8.internal.bD0:
-com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.internal.cD0:
+com.android.tools.r8.ir.conversion.CfBuilder$1 -> com.android.tools.r8.internal.eD0:
+com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.internal.fD0:
     int height -> b
     boolean $assertionsDisabled -> c
     int maxHeight -> a
@@ -77074,7 +77115,7 @@ com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.t
     1:3:void <init>():106:108 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.conversion.CfBuilder$1):106:106 -> <init>
     1:3:void push(com.android.tools.r8.ir.code.Value):115:117 -> a
-com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.internal.QE0:
+com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.internal.TE0:
     int currentInstructionIndex -> o
     com.android.tools.r8.graph.CfCode code -> h
     com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo currentBlockInfo -> a
@@ -77105,7 +77146,7 @@ com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.internal
     void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder) -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
     1:3:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):303:305 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     4:4:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):305 -> a
     5:7:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):305:305 -> a
     9:15:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):307:313 -> a
@@ -77218,16 +77259,16 @@ com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.internal
     335:335:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):705 -> a
     336:370:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):707:741 -> a
     371:372:boolean isControlFlow(com.android.tools.r8.cf.code.CfInstruction):823:824 -> a
-    373:373:boolean hasValidTypesFromStackMap():861:861 -> a
-    374:380:com.android.tools.r8.ir.code.Position getCanonicalPosition(com.android.tools.r8.ir.code.Position):898:898 -> a
+    373:373:boolean hasValidTypesFromStackMap():863:863 -> a
+    374:380:com.android.tools.r8.ir.code.Position getCanonicalPosition(com.android.tools.r8.ir.code.Position):900:900 -> a
     void setUp() -> b
     1:1:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isCurrentlyGeneratingMethodSynchronization():420:420 -> b
     1:1:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):831 -> b
     2:4:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):834:836 -> b
     5:10:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):835:840 -> b
-    11:19:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):867:867 -> b
-    28:41:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):876:889 -> b
-    42:42:boolean lambda$getCanonicalDebugPositionAtOffset$0(com.android.tools.r8.cf.code.CfInstruction):871:871 -> b
+    11:19:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):869:869 -> b
+    28:41:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):878:891 -> b
+    42:42:boolean lambda$getCanonicalDebugPositionAtOffset$0(com.android.tools.r8.cf.code.CfInstruction):873:873 -> b
     1:25:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):388:412 -> c
     26:39:void com.android.tools.r8.ir.conversion.CfSourceCode.buildMethodEnterSynchronization(com.android.tools.r8.ir.conversion.IRBuilder):428:441 -> c
     26:39:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):413 -> c
@@ -77237,12 +77278,12 @@ com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.internal
     43:43:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):746:746 -> c
     44:44:boolean com.android.tools.r8.ir.conversion.CfSourceCode.isCurrentlyGeneratingMethodSynchronization():420:420 -> c
     44:44:boolean verifyCurrentInstructionCanThrow():850 -> c
-    45:46:boolean verifyCurrentInstructionCanThrow():850:851 -> c
-    47:47:com.android.tools.r8.ir.code.Position lambda$getCanonicalDebugPositionAtOffset$1(com.android.tools.r8.cf.code.CfInstruction):872:872 -> c
+    45:48:boolean verifyCurrentInstructionCanThrow():850:853 -> c
+    49:49:com.android.tools.r8.ir.code.Position lambda$getCanonicalDebugPositionAtOffset$1(com.android.tools.r8.cf.code.CfInstruction):874:874 -> c
     int getMoveExceptionRegister(int) -> d
     1:1:int instructionCount():277:277 -> d
     int instructionOffset(int) -> e
-    1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():894:894 -> e
+    1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():896:896 -> e
     boolean verifyRegister(int) -> f
     1:1:int getCurrentInstructionIndex():593:593 -> f
     int instructionIndex(int) -> g
@@ -77255,20 +77296,20 @@ com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.internal
     1:1:com.android.tools.r8.graph.DexType getOriginalHolder():272:272 -> i
     2:26:int[] getTargets(int):359:383 -> i
     27:28:int[] getTargets(int):363:364 -> i
-    1:1:java.lang.Iterable lambda$getCanonicalDebugPositionAtOffset$2():873:873 -> j
-    2:5:java.lang.Iterable lambda$getCanonicalDebugPositionAtOffset$2():870:873 -> j
+    1:1:java.lang.Iterable lambda$getCanonicalDebugPositionAtOffset$2():875:875 -> j
+    2:5:java.lang.Iterable lambda$getCanonicalDebugPositionAtOffset$2():872:875 -> j
     1:1:boolean localsChanged():776:776 -> k
     1:10:void setLocalVariableLists():763:772 -> l
-com.android.tools.r8.ir.conversion.CfSourceCode$1 -> com.android.tools.r8.internal.NE0:
+com.android.tools.r8.ir.conversion.CfSourceCode$1 -> com.android.tools.r8.internal.QE0:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():806:806 -> <clinit>
-com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.internal.OE0:
+com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.internal.RE0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap locals -> c
     int endOffset -> b
     int startOffset -> a
     1:4:void <init>(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):145:148 -> <init>
     1:19:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList compute(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):158:176 -> a
-com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.internal.PE0:
+com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.internal.SE0:
     java.util.List guards -> c
     boolean $assertionsDisabled -> e
     int endOffset -> b
@@ -77277,13 +77318,13 @@ com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.to
     1:1:void <clinit>():70:70 -> <clinit>
     1:5:void <init>(int,int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):77:81 -> <init>
     1:2:boolean isEmpty():89:90 -> a
-com.android.tools.r8.ir.conversion.CfSourceUtils -> com.android.tools.r8.internal.RE0:
+com.android.tools.r8.ir.conversion.CfSourceUtils -> com.android.tools.r8.internal.UE0:
     1:1:com.android.tools.r8.cf.code.CfInstruction com.android.tools.r8.ir.conversion.CfSourceUtils.getLastInstruction(java.util.List):24:24 -> a
     1:1:com.android.tools.r8.cf.code.CfLabel ensureLabel(java.util.List):14 -> a
     2:2:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
     2:2:com.android.tools.r8.cf.code.CfLabel ensureLabel(java.util.List):15 -> a
     3:6:com.android.tools.r8.cf.code.CfLabel ensureLabel(java.util.List):16:19 -> a
-com.android.tools.r8.ir.conversion.CfState -> com.android.tools.r8.internal.eF0:
+com.android.tools.r8.ir.conversion.CfState -> com.android.tools.r8.internal.hF0:
     com.android.tools.r8.ir.conversion.CfState$Snapshot current -> a
     com.android.tools.r8.ir.code.Position position -> b
     boolean $assertionsDisabled -> c
@@ -77321,8 +77362,8 @@ com.android.tools.r8.ir.conversion.CfState -> com.android.tools.r8.internal.eF0:
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():201:201 -> c
     1:2:com.android.tools.r8.ir.conversion.CfState$Slot pop():187:188 -> d
     1:1:java.lang.String toString():236:236 -> toString
-com.android.tools.r8.ir.conversion.CfState$1 -> com.android.tools.r8.internal.UE0:
-com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.internal.VE0:
+com.android.tools.r8.ir.conversion.CfState$1 -> com.android.tools.r8.internal.XE0:
+com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.internal.YE0:
     com.android.tools.r8.ir.conversion.CfState$SlotType[] locals -> c
     com.android.tools.r8.ir.conversion.CfState$SlotType[] stack -> d
     boolean $assertionsDisabled -> e
@@ -77345,7 +77386,7 @@ com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.
     5:5:com.android.tools.r8.ir.conversion.CfState$Slot peek():390:390 -> c
     1:1:int stackHeight():374:374 -> d
     1:15:java.lang.String toString():419:433 -> toString
-com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.internal.WE0:
+com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.internal.ZE0:
     int stackHeight -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():476:476 -> <clinit>
@@ -77354,7 +77395,7 @@ com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.internal.
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():499:499 -> c
     1:1:int stackHeight():488:488 -> d
     1:1:java.lang.String toString():504:504 -> toString
-com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.internal.XE0:
+com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.internal.aF0:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():437:437 -> <clinit>
@@ -77381,7 +77422,7 @@ com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.internal
     2:2:int com.android.tools.r8.ir.conversion.CfState$Slot.access$500(com.android.tools.r8.ir.conversion.CfState$Slot):239 -> d
     2:2:int stackHeight():449 -> d
     1:1:java.lang.String toString():472:472 -> toString
-com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.internal.YE0:
+com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.internal.bF0:
     com.android.tools.r8.ir.conversion.CfState$SlotType slotType -> d
     com.android.tools.r8.ir.code.ValueType type -> b
     boolean $assertionsDisabled -> e
@@ -77398,24 +77439,24 @@ com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.internal
     6:6:boolean com.android.tools.r8.ir.conversion.CfState$SlotType.isPrecise():0:0 -> a
     6:6:boolean isPrecise():284 -> a
     1:3:java.lang.String toString():270:272 -> toString
-com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.internal.bF0:
+com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.internal.eF0:
     1:1:void <init>():14:14 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.conversion.CfState$1):14:14 -> <init>
     com.android.tools.r8.ir.code.ValueType getImprecise() -> a
     com.android.tools.r8.graph.DexType getPrecise() -> b
-com.android.tools.r8.ir.conversion.CfState$SlotType$Imprecise -> com.android.tools.r8.internal.ZE0:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Imprecise -> com.android.tools.r8.internal.cF0:
     com.android.tools.r8.ir.code.ValueType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.ValueType):56:57 -> <init>
     1:1:com.android.tools.r8.ir.code.ValueType getImprecise():67:67 -> a
     com.android.tools.r8.graph.DexType getPrecise() -> b
     1:1:java.lang.String toString():72:72 -> toString
-com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.internal.aF0:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.internal.dF0:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):27:28 -> <init>
     1:1:com.android.tools.r8.ir.code.ValueType getImprecise():38:38 -> a
     1:1:com.android.tools.r8.graph.DexType getPrecise():33:33 -> b
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.internal.cF0:
+com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.internal.fF0:
     com.android.tools.r8.ir.conversion.CfState$Snapshot parent -> a
     int updates -> b
     1:1:void <init>(com.android.tools.r8.ir.conversion.CfState$Snapshot,int,com.android.tools.r8.ir.conversion.CfState$1):288:288 -> <init>
@@ -77427,7 +77468,7 @@ com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.inte
     2:2:com.android.tools.r8.ir.conversion.CfState$Slot getStack(int):306:306 -> b
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():310:310 -> c
     1:1:int stackHeight():298:298 -> d
-com.android.tools.r8.ir.conversion.CfState$Write -> com.android.tools.r8.internal.dF0:
+com.android.tools.r8.ir.conversion.CfState$Write -> com.android.tools.r8.internal.gF0:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():508:508 -> <clinit>
@@ -77462,13 +77503,13 @@ com.android.tools.r8.ir.conversion.ClassConverter$LibraryDesugaredClassConverter
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor):154:154 -> <init>
     1:5:void convertClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer):166:170 -> a
     6:6:void notifyAllClassesConverted():176:176 -> a
-com.android.tools.r8.ir.conversion.ClassConverterResult -> com.android.tools.r8.internal.hG0:
+com.android.tools.r8.ir.conversion.ClassConverterResult -> com.android.tools.r8.internal.kG0:
     java.util.Map forcefullyMovedLambdaMethods -> a
     1:1:void <init>(java.util.Map,com.android.tools.r8.ir.conversion.ClassConverterResult$1):12:12 -> <init>
     2:3:void <init>(java.util.Map):16:17 -> <init>
     1:1:java.util.Map getForcefullyMovedLambdaMethods():25:25 -> a
-com.android.tools.r8.ir.conversion.ClassConverterResult$1 -> com.android.tools.r8.internal.fG0:
-com.android.tools.r8.ir.conversion.ClassConverterResult$Builder -> com.android.tools.r8.internal.gG0:
+com.android.tools.r8.ir.conversion.ClassConverterResult$1 -> com.android.tools.r8.internal.iG0:
+com.android.tools.r8.ir.conversion.ClassConverterResult$Builder -> com.android.tools.r8.internal.jG0:
     java.util.Map forcefullyMovedLambdaMethods -> a
     1:3:void <init>():28:30 -> <init>
     1:1:void acceptForcefullyMovedLambdaMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):34:34 -> b
@@ -77510,12 +77551,12 @@ com.android.tools.r8.ir.conversion.D8MethodProcessor -> com.android.tools.r8.ir.
     boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod) -> d
     1:1:void newWave():55:55 -> d
     1:5:com.android.tools.r8.utils.Timing lambda$scheduleDesugaredMethodForProcessing$1(com.android.tools.r8.graph.ProgramMethod):110:114 -> e
-    6:6:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1069:1069 -> e
+    6:6:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1080:1080 -> e
     6:6:com.android.tools.r8.utils.Timing lambda$scheduleDesugaredMethodForProcessing$1(com.android.tools.r8.graph.ProgramMethod):110 -> e
-    7:7:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1067:1067 -> e
+    7:7:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1078:1078 -> e
     7:7:com.android.tools.r8.utils.Timing lambda$scheduleDesugaredMethodForProcessing$1(com.android.tools.r8.graph.ProgramMethod):110 -> e
     8:9:boolean verifyNoPendingMethodProcessing():156:157 -> e
-com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.internal.BL0:
+com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.internal.EL0:
     boolean hasBackwardsBranch -> m
     int outRegisterCount -> l
     boolean $assertionsDisabled -> o
@@ -77646,10 +77687,10 @@ com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.internal.B
     4:4:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):664:664 -> c
     5:5:com.android.tools.r8.ir.regalloc.RegisterAllocator getRegisterAllocator():877:877 -> c
     1:1:boolean isBuildingForComparison():155:155 -> d
-com.android.tools.r8.ir.conversion.DexBuilder$1 -> com.android.tools.r8.internal.qL0:
+com.android.tools.r8.ir.conversion.DexBuilder$1 -> com.android.tools.r8.internal.tL0:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():1275:1275 -> <clinit>
-com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.internal.rL0:
+com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.internal.uL0:
     1:1:void <init>(com.android.tools.r8.ir.code.Instruction):1046:1046 -> <init>
     void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List) -> a
     int computeSize(com.android.tools.r8.ir.conversion.DexBuilder) -> a
@@ -77657,11 +77698,11 @@ com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.too
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.internal.sL0:
+com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.internal.vL0:
     com.android.tools.r8.code.FillArrayData dex -> b
     com.android.tools.r8.ir.code.NewArrayFilledData ir -> a
     1:3:void <init>(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):1521:1523 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.internal.tL0:
+com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.internal.wL0:
     com.android.tools.r8.code.Instruction instruction -> e
     1:2:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):953:954 -> <init>
     1:2:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):974:975 -> a
@@ -77670,7 +77711,7 @@ com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools
     1:1:int getSize():959:959 -> d
     1:1:int maxSize():969:969 -> e
     1:1:int minSize():964:964 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.internal.uL0:
+com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.internal.xL0:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1079:1079 -> <clinit>
@@ -77689,7 +77730,7 @@ com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.i
     1:2:int getSize():1093:1094 -> d
     1:1:int maxSize():1105:1105 -> e
     1:1:int minSize():1099:1099 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.internal.vL0:
+com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.internal.yL0:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1210:1210 -> <clinit>
@@ -77805,7 +77846,7 @@ com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.int
     1:1:int getSize():1343:1343 -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.internal.wL0:
+com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.internal.zL0:
     com.android.tools.r8.ir.code.Instruction ir -> a
     int offset -> b
     int maxOffset -> c
@@ -77825,7 +77866,7 @@ com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.inter
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.internal.xL0:
+com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.internal.AL0:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1357:1357 -> <clinit>
@@ -77872,7 +77913,7 @@ com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.i
     1:2:int getSize():1469:1470 -> d
     1:1:int maxSize():1463:1463 -> e
     1:1:int minSize():1457:1457 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.internal.yL0:
+com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.internal.BL0:
     int size -> f
     com.android.tools.r8.code.Instruction[] instructions -> e
     1:7:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):997:1003 -> <init>
@@ -77882,11 +77923,11 @@ com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.
     1:1:int getSize():1033:1033 -> d
     1:1:int maxSize():1028:1028 -> e
     1:1:int minSize():1023:1023 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.internal.zL0:
+com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.internal.CL0:
     com.android.tools.r8.ir.code.IntSwitch ir -> a
     com.android.tools.r8.code.Format31t dex -> b
     1:3:void <init>(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.code.Format31t):1510:1512 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.internal.AL0:
+com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.internal.DL0:
     com.android.tools.r8.ir.code.CatchHandlers handlers -> a
     int start -> b
     int end -> c
@@ -77895,99 +77936,98 @@ com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.in
     1:1:int compareTo(java.lang.Object):1487:1487 -> compareTo
     2:2:int com.android.tools.r8.ir.conversion.DexBuilder$TryItem.compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1501:1501 -> compareTo
     2:2:int compareTo(java.lang.Object):1487 -> compareTo
-com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.internal.sM0:
-    boolean $assertionsDisabled -> m
-    com.android.tools.r8.ir.code.Position currentPosition -> i
-    com.android.tools.r8.graph.DexMethod originalMethod -> l
+com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.internal.vM0:
+    boolean $assertionsDisabled -> n
+    com.android.tools.r8.ir.code.Position currentPosition -> j
+    com.android.tools.r8.graph.DexMethod originalMethod -> m
     com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver arrayFilledDataPayloadResolver -> e
+    boolean isBuildingPrelude -> i
     com.android.tools.r8.graph.ProgramMethod method -> b
-    com.android.tools.r8.ir.code.CanonicalPositions canonicalPositions -> j
+    com.android.tools.r8.ir.code.CanonicalPositions canonicalPositions -> k
     com.android.tools.r8.graph.DexCode code -> a
     com.android.tools.r8.graph.DexCode$Try currentTryRange -> f
     com.android.tools.r8.ir.code.CatchHandlers currentCatchHandlers -> g
     java.util.Map offsetToInstructionIndex -> c
     com.android.tools.r8.code.Instruction currentDexInstruction -> h
     com.android.tools.r8.ir.conversion.SwitchPayloadResolver switchPayloadResolver -> d
-    java.util.List debugEntries -> k
+    java.util.List debugEntries -> l
     1:1:void <clinit>():54:54 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):78:78 -> <init>
-    2:33:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):60:91 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):79:79 -> <init>
+    2:34:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):60:92 -> <init>
     void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean) -> a
     void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder) -> a
     void doNothingWriteConsumer(java.lang.Integer,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int) -> a
     com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int) -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
-    1:1:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):165:165 -> a
-    2:2:int com.android.tools.r8.ir.conversion.DexSourceCode.instructionOffset(int):277:277 -> a
-    2:2:void com.android.tools.r8.ir.conversion.DexSourceCode.updateCurrentCatchHandlers(int,com.android.tools.r8.graph.DexItemFactory):210 -> a
-    2:2:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):165 -> a
-    3:11:void com.android.tools.r8.ir.conversion.DexSourceCode.updateCurrentCatchHandlers(int,com.android.tools.r8.graph.DexItemFactory):210:218 -> a
-    3:11:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):165 -> a
-    12:12:void com.android.tools.r8.ir.conversion.DexSourceCode.updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):236:236 -> a
-    12:12:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):166 -> a
-    13:13:int com.android.tools.r8.ir.conversion.DexSourceCode.instructionOffset(int):277:277 -> a
-    13:13:void com.android.tools.r8.ir.conversion.DexSourceCode.updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):239 -> a
-    13:13:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):166 -> a
-    14:20:void com.android.tools.r8.ir.conversion.DexSourceCode.updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):240:246 -> a
-    14:20:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):166 -> a
-    21:22:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):167:168 -> a
-    23:25:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):253:253 -> a
-    28:34:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):256:256 -> a
-    35:37:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):283:283 -> a
-    38:42:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):290:290 -> a
-    43:43:boolean isMoveResult(com.android.tools.r8.code.Instruction):316:316 -> a
-    44:76:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):323:355 -> a
-    77:77:java.util.Set com.android.tools.r8.ir.conversion.DexSourceCode.getUniqueTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):430:430 -> a
-    77:77:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):355 -> a
-    78:83:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):355:360 -> a
-    84:84:boolean com.android.tools.r8.ir.conversion.DexSourceCode.isInvoke(com.android.tools.r8.code.Instruction):297:297 -> a
-    84:84:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):360 -> a
-    85:102:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):360:377 -> a
+    1:1:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):168:168 -> a
+    2:2:int com.android.tools.r8.ir.conversion.DexSourceCode.instructionOffset(int):281:281 -> a
+    2:2:void com.android.tools.r8.ir.conversion.DexSourceCode.updateCurrentCatchHandlers(int,com.android.tools.r8.graph.DexItemFactory):214 -> a
+    2:2:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):168 -> a
+    3:11:void com.android.tools.r8.ir.conversion.DexSourceCode.updateCurrentCatchHandlers(int,com.android.tools.r8.graph.DexItemFactory):214:222 -> a
+    3:11:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):168 -> a
+    12:12:void com.android.tools.r8.ir.conversion.DexSourceCode.updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):240:240 -> a
+    12:12:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):169 -> a
+    13:13:int com.android.tools.r8.ir.conversion.DexSourceCode.instructionOffset(int):281:281 -> a
+    13:13:void com.android.tools.r8.ir.conversion.DexSourceCode.updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):243 -> a
+    13:13:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):169 -> a
+    14:20:void com.android.tools.r8.ir.conversion.DexSourceCode.updateDebugPosition(int,com.android.tools.r8.ir.conversion.IRBuilder):244:250 -> a
+    14:20:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):169 -> a
+    21:22:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):170:171 -> a
+    23:25:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):257:257 -> a
+    28:34:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):260:260 -> a
+    35:37:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):287:287 -> a
+    38:42:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):294:294 -> a
+    43:43:boolean isMoveResult(com.android.tools.r8.code.Instruction):320:320 -> a
+    44:76:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):327:359 -> a
+    77:77:java.util.Set com.android.tools.r8.ir.conversion.DexSourceCode.getUniqueTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):434:434 -> a
+    77:77:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):359 -> a
+    78:83:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):359:364 -> a
+    84:84:boolean com.android.tools.r8.ir.conversion.DexSourceCode.isInvoke(com.android.tools.r8.code.Instruction):301:301 -> a
+    84:84:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):364 -> a
+    85:102:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):364:381 -> a
     103:104:int[] com.android.tools.r8.ir.conversion.SwitchPayloadResolver.absoluteTargets(com.android.tools.r8.code.Instruction):63:64 -> a
-    103:104:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):377 -> a
-    105:108:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):377:380 -> a
-    109:118:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexCode$Try):402:411 -> a
-    119:120:void lambda$getCurrentCatchHandlers$0(java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):408:409 -> a
-    121:129:void forEachTryRange(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):416:424 -> a
-    130:131:java.util.List getTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):434:435 -> a
-    132:132:void lambda$getTryHandlerOffsets$1(java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):435:435 -> a
-    1:8:void setUp():122:129 -> b
-    9:9:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):173:173 -> b
-    10:13:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):188:191 -> b
+    103:104:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):381 -> a
+    105:108:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):381:384 -> a
+    109:118:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexCode$Try):406:415 -> a
+    119:120:void lambda$getCurrentCatchHandlers$0(java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):412:413 -> a
+    121:129:void forEachTryRange(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):420:428 -> a
+    130:131:java.util.List getTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):438:439 -> a
+    132:132:void lambda$getTryHandlerOffsets$1(java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):439:439 -> a
+    1:8:void setUp():123:130 -> b
+    9:9:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):176:176 -> b
+    10:13:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):191:194 -> b
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> c
-    1:7:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):137:143 -> c
-    8:8:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):141:141 -> c
-    9:9:boolean verifyCurrentInstructionCanThrow():201:201 -> c
-    1:2:void clear():266:267 -> clear
-    1:1:int instructionCount():101:101 -> d
-    2:5:int getMoveExceptionRegister(int):178:181 -> d
-    1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():196:196 -> e
-    2:2:int instructionOffset(int):277:277 -> e
-    1:1:boolean verifyRegister(int):96:96 -> f
-    1:1:int instructionIndex(int):272:272 -> g
-    1:3:com.android.tools.r8.graph.DexDebugEntry getDebugEntryAtOffset(int):224:226 -> h
-    1:1:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):393:393 -> i
-    2:2:boolean com.android.tools.r8.ir.conversion.DexSourceCode.inTryRange(com.android.tools.r8.graph.DexCode$Try,int):388:388 -> i
-    2:2:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):394 -> i
-com.android.tools.r8.ir.conversion.ExtraConstantIntParameter -> com.android.tools.r8.internal.vO0:
+    1:7:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):138:144 -> c
+    8:13:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):142:147 -> c
+    14:14:boolean verifyCurrentInstructionCanThrow():205:205 -> c
+    1:2:void clear():270:271 -> clear
+    1:1:int instructionCount():102:102 -> d
+    2:5:int getMoveExceptionRegister(int):181:184 -> d
+    1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():199:199 -> e
+    2:2:int instructionOffset(int):281:281 -> e
+    1:1:boolean verifyRegister(int):97:97 -> f
+    1:1:int instructionIndex(int):276:276 -> g
+    1:3:com.android.tools.r8.graph.DexDebugEntry getDebugEntryAtOffset(int):228:230 -> h
+    1:1:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):397:397 -> i
+    2:2:boolean com.android.tools.r8.ir.conversion.DexSourceCode.inTryRange(com.android.tools.r8.graph.DexCode$Try,int):392:392 -> i
+    2:2:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):398 -> i
+com.android.tools.r8.ir.conversion.ExtraConstantIntParameter -> com.android.tools.r8.internal.yO0:
     long value -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():12:12 -> <clinit>
     1:2:void <init>(long):15:16 -> <init>
     1:2:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):21:22 -> a
     3:3:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):27:27 -> a
-com.android.tools.r8.ir.conversion.ExtraParameter -> com.android.tools.r8.internal.wO0:
+com.android.tools.r8.ir.conversion.ExtraParameter -> com.android.tools.r8.internal.zO0:
     1:1:void <init>():12:12 -> <init>
     com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView) -> a
-com.android.tools.r8.ir.conversion.ExtraUnusedNullParameter -> com.android.tools.r8.internal.xO0:
+com.android.tools.r8.ir.conversion.ExtraUnusedNullParameter -> com.android.tools.r8.internal.AO0:
     1:1:void <init>():13:13 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):17:17 -> a
     2:2:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):22:22 -> a
-    3:3:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createNullValue():37:37 -> a
-    3:3:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):22 -> a
-com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.internal.QR0:
+com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.internal.TR0:
     java.util.Queue ssaWorklist -> f
     com.android.tools.r8.origin.Origin origin -> p
     int currentInstructionOffset -> j
@@ -78019,995 +78059,1032 @@ com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.internal.QR
     com.android.tools.r8.graph.ProgramMethod context -> n
     boolean hasIncorrectStackMapTypes -> B
     boolean $assertionsDisabled -> D
-    1:1:void <clinit>():154:154 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.ir.code.NumberGenerator):473:473 -> <init>
-    2:112:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.ir.code.NumberGenerator):372:482 -> <init>
-    1:21:com.android.tools.r8.ir.analysis.type.TypeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):159:179 -> a
-    22:22:com.android.tools.r8.ir.analysis.type.TypeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):174:174 -> a
-    23:27:com.android.tools.r8.ir.analysis.type.TypeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):168:172 -> a
-    28:28:com.android.tools.r8.ir.analysis.type.TypeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):170:170 -> a
-    29:29:com.android.tools.r8.ir.analysis.type.TypeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):166:166 -> a
-    30:43:com.android.tools.r8.ir.analysis.type.TypeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):164:177 -> a
-    44:44:com.android.tools.r8.ir.conversion.IRBuilder create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin):435:435 -> a
-    45:45:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.ir.conversion.IRBuilder.lookupPrototypeChanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):456:456 -> a
-    45:45:com.android.tools.r8.ir.conversion.IRBuilder create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin):440 -> a
-    46:46:com.android.tools.r8.ir.conversion.IRBuilder create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin):440:440 -> a
-    47:47:com.android.tools.r8.ir.conversion.IRBuilder createForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.graph.RewrittenPrototypeDescription):451:451 -> a
-    48:49:void addToWorklist(com.android.tools.r8.ir.code.BasicBlock,int):516:517 -> a
-    50:57:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):527:534 -> a
-    58:61:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int):990:993 -> a
-    58:61:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):535 -> a
-    62:62:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2375:2375 -> a
-    62:62:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):998 -> a
-    62:62:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int):994 -> a
-    62:62:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):535 -> a
-    63:64:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):999:1000 -> a
-    63:64:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int):994 -> a
-    63:64:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):535 -> a
-    65:65:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> a
-    65:65:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1000 -> a
-    65:65:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int):994 -> a
-    65:65:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):535 -> a
-    66:67:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1001:1002 -> a
-    66:67:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int):994 -> a
-    66:67:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):535 -> a
-    68:82:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):541:555 -> a
-    83:83:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):554:554 -> a
-    84:87:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1039:1042 -> a
-    84:87:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1034 -> a
-    84:87:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):556 -> a
-    88:88:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2375:2375 -> a
-    88:88:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1044 -> a
-    88:88:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1034 -> a
-    88:88:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):556 -> a
-    89:92:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1045:1048 -> a
-    89:92:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1034 -> a
-    89:92:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):556 -> a
-    93:96:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):559:562 -> a
-    97:125:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):561:589 -> a
-    126:127:void com.android.tools.r8.ir.conversion.IRBuilder.addExtraUnusedNullArgument(int):1009:1010 -> a
-    126:127:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):590 -> a
-    128:132:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):592:596 -> a
-    133:151:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):606:624 -> a
-    152:154:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2554:2556 -> a
-    152:154:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):629 -> a
-    155:156:void com.android.tools.r8.ir.conversion.IRBuilder.ensureSubroutineProcessedInstructions():2564:2565 -> a
-    155:156:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2559 -> a
-    155:156:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):629 -> a
-    157:157:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2560:2560 -> a
-    157:157:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):629 -> a
-    158:168:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):630:640 -> a
-    169:169:void com.android.tools.r8.ir.conversion.IRBuilder.ensureNormalSuccessorBlock(int,int):2585:2585 -> a
-    169:169:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):641 -> a
-    170:172:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):647:649 -> a
-    173:173:void com.android.tools.r8.ir.conversion.IRBuilder.setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):522:522 -> a
-    173:173:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):649 -> a
-    174:179:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):650:655 -> a
-    180:185:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():887:892 -> a
-    180:185:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):656 -> a
-    186:186:void com.android.tools.r8.ir.conversion.IRBuilder.setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):522:522 -> a
-    186:186:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():892 -> a
-    186:186:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):656 -> a
-    187:191:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():893:897 -> a
-    187:191:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):656 -> a
-    192:216:void com.android.tools.r8.ir.conversion.IRBuilder.processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):938:962 -> a
-    192:216:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():897 -> a
-    192:216:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):656 -> a
-    217:222:void com.android.tools.r8.ir.conversion.IRBuilder.processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):961:966 -> a
-    217:222:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():897 -> a
-    217:222:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):656 -> a
-    223:230:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():898:905 -> a
-    223:230:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):656 -> a
-    231:241:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():904:914 -> a
-    231:241:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):656 -> a
-    242:242:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> a
-    242:242:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():914 -> a
-    242:242:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):656 -> a
-    243:252:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():918:927 -> a
-    243:252:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):656 -> a
-    253:256:void com.android.tools.r8.ir.conversion.IRBuilder.closeCurrentBlockWithFallThrough(com.android.tools.r8.ir.code.BasicBlock):2630:2633 -> a
-    253:256:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():927 -> a
-    253:256:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):656 -> a
-    257:258:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():930:931 -> a
-    257:258:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):656 -> a
-    259:259:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():887:887 -> a
-    259:259:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):656 -> a
-    260:260:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):659:659 -> a
-    261:262:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():826:827 -> a
-    261:262:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):664 -> a
-    263:268:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):833:838 -> a
-    263:268:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():827 -> a
-    263:268:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):664 -> a
-    269:269:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():303:303 -> a
-    269:269:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):838 -> a
-    269:269:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():827 -> a
-    269:269:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):664 -> a
-    270:276:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):855:861 -> a
-    270:276:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):838 -> a
-    270:276:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():827 -> a
-    270:276:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):664 -> a
-    277:278:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):878:879 -> a
-    277:278:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):862 -> a
-    277:278:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):838 -> a
-    277:278:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():827 -> a
-    277:278:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):664 -> a
-    279:279:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
-    279:279:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):879 -> a
-    279:279:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):862 -> a
-    279:279:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):838 -> a
-    279:279:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():827 -> a
-    279:279:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):664 -> a
-    280:281:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):880:881 -> a
-    280:281:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):862 -> a
-    280:281:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):838 -> a
-    280:281:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():827 -> a
-    280:281:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):664 -> a
-    282:282:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):879:879 -> a
-    282:282:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):862 -> a
-    282:282:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):838 -> a
-    282:282:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():827 -> a
-    282:282:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):664 -> a
-    283:290:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):866:873 -> a
-    283:290:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):838 -> a
-    283:290:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():827 -> a
-    283:290:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):664 -> a
-    291:297:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):838:844 -> a
-    291:297:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():827 -> a
-    291:297:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):664 -> a
-    298:298:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):841:841 -> a
-    298:298:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():827 -> a
-    298:298:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):664 -> a
-    299:307:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():795:803 -> a
-    299:307:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):667 -> a
-    308:308:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
-    308:308:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():804 -> a
-    308:308:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):667 -> a
-    309:309:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():805:805 -> a
-    309:309:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):667 -> a
-    310:310:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
-    310:310:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():807 -> a
-    310:310:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):667 -> a
-    311:318:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():808:815 -> a
-    311:318:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):667 -> a
-    319:319:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():38:38 -> a
-    319:319:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():816 -> a
-    319:319:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):667 -> a
-    320:320:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):38:38 -> a
-    320:320:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():817 -> a
-    320:320:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):667 -> a
-    321:321:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():818:818 -> a
-    321:321:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):667 -> a
-    322:323:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):670:671 -> a
-    324:324:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1594:1594 -> a
-    324:324:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):671 -> a
-    325:327:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):672:674 -> a
-    328:328:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():38:38 -> a
-    328:328:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):674 -> a
-    329:334:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):675:680 -> a
-    335:335:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):38:38 -> a
-    335:335:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):681 -> a
-    336:337:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):688:689 -> a
-    338:368:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2718:2748 -> a
-    338:368:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):694 -> a
-    369:369:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1594:1594 -> a
-    369:369:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2748 -> a
-    369:369:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):694 -> a
-    370:370:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2748:2748 -> a
-    370:370:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):694 -> a
-    371:385:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2747:2761 -> a
-    371:385:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):694 -> a
-    386:397:void com.android.tools.r8.ir.code.BasicBlock.removePredecessorsByIndex(java.util.List):567:578 -> a
-    386:397:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2765 -> a
-    386:397:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):694 -> a
-    398:398:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2766:2766 -> a
-    398:398:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):694 -> a
-    399:399:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2724:2724 -> a
-    399:399:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):694 -> a
-    400:400:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    400:400:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2724 -> a
-    400:400:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):694 -> a
-    401:401:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    401:401:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    401:401:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2724 -> a
-    401:401:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):694 -> a
-    402:446:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2724:2768 -> a
-    402:446:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):694 -> a
-    447:461:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):697:711 -> a
-    462:462:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1218:1218 -> a
-    462:462:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):714 -> a
-    463:477:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):715:729 -> a
-    478:478:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    478:478:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):729 -> a
-    479:479:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):729:729 -> a
-    480:480:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):725:725 -> a
-    481:481:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    481:481:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):725 -> a
-    482:482:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):725:725 -> a
-    483:501:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):720:738 -> a
-    502:502:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.isConcreteCallSiteOptimizationInfo():0:0 -> a
-    502:502:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):738 -> a
-    503:508:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):738:743 -> a
-    509:509:boolean com.android.tools.r8.graph.AppView.hasLiveness():611:611 -> a
-    509:509:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):743 -> a
-    510:518:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):744:752 -> a
-    519:527:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):749:757 -> a
-    528:528:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1775:1775 -> a
-    528:528:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):757 -> a
-    529:529:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):758:758 -> a
-    530:541:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):127:138 -> a
-    530:541:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    530:541:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):758 -> a
-    542:542:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854:854 -> a
-    542:542:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):138 -> a
-    542:542:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    542:542:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):758 -> a
-    543:551:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):147:155 -> a
-    543:551:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    543:551:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):758 -> a
-    552:552:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854:854 -> a
-    552:552:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):155 -> a
-    552:552:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    552:552:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):758 -> a
-    553:557:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):168:172 -> a
-    553:557:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    553:557:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):758 -> a
-    558:558:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):113:113 -> a
-    558:558:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):758 -> a
-    559:559:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo.builder(com.android.tools.r8.graph.DexItemFactory):271:271 -> a
-    559:559:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.convertRewritingCandidateToStringSwitchInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory):178 -> a
-    559:559:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):114 -> a
-    559:559:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):758 -> a
-    560:562:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.convertRewritingCandidateToStringSwitchInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory):178:180 -> a
-    560:562:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):114 -> a
-    560:562:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):758 -> a
-    563:564:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):119:120 -> a
-    563:564:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):758 -> a
-    565:569:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):761:765 -> a
-    570:571:boolean allPhisAreStackMapPhis(com.android.tools.r8.ir.code.IRCode):775:776 -> a
-    572:572:void constrainType(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):784:784 -> a
-    573:573:void resolveAndBuildSwitch(int,int,int):971:971 -> a
-    574:574:void add(com.android.tools.r8.ir.code.Instruction):985:985 -> a
-    575:575:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> a
-    575:575:void add(com.android.tools.r8.ir.code.Instruction):986 -> a
-    576:577:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):1026:1027 -> a
-    578:578:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> a
-    578:578:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):1029 -> a
-    579:579:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):1030:1030 -> a
-    580:584:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1085:1089 -> a
-    585:585:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():533:533 -> a
-    585:585:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1062 -> a
-    585:585:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1090 -> a
-    586:586:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> a
-    586:586:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():533 -> a
-    586:586:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1062 -> a
-    586:586:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1090 -> a
-    587:587:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1062:1062 -> a
-    587:587:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1090 -> a
-    588:588:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1091:1091 -> a
-    589:595:void addDebugPosition(com.android.tools.r8.ir.code.Position):1096:1102 -> a
-    596:596:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> a
-    596:596:void addDebugPosition(com.android.tools.r8.ir.code.Position):1102 -> a
-    597:601:void addDebugPosition(com.android.tools.r8.ir.code.Position):1109:1113 -> a
-    602:602:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> a
-    602:602:void addDebugPosition(com.android.tools.r8.ir.code.Position):1113 -> a
-    603:612:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1157:1166 -> a
-    613:613:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    613:613:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1166 -> a
-    614:623:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1166:1175 -> a
-    624:627:void com.android.tools.r8.ir.conversion.IRBuilder.addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):788:791 -> a
-    624:627:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1176 -> a
-    628:628:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1178:1178 -> a
-    629:633:void addArrayLength(int,int):1182:1186 -> a
-    634:634:void addCheckCast(int,com.android.tools.r8.graph.DexType):1201:1201 -> a
-    635:642:void internalAddCheckCast(int,com.android.tools.r8.graph.DexType,boolean):1209:1216 -> a
-    643:646:void addConst(com.android.tools.r8.ir.analysis.type.TypeElement,int,long):1229:1232 -> a
-    647:647:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1264:1264 -> a
-    648:648:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    648:648:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodHandle():1703 -> a
-    648:648:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1264 -> a
-    649:649:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodHandle():1703:1703 -> a
-    649:649:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1264 -> a
-    650:650:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1656:1656 -> a
-    650:650:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodHandle():1703 -> a
-    650:650:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1264 -> a
-    651:653:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1270:1272 -> a
-    654:658:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1271:1275 -> a
-    659:659:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1265:1265 -> a
-    660:660:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1279:1279 -> a
-    661:661:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    661:661:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodType():1707 -> a
-    661:661:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1279 -> a
-    662:662:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodType():1707:1707 -> a
-    662:662:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1279 -> a
-    663:663:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1656:1656 -> a
-    663:663:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodType():1707 -> a
-    663:663:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1279 -> a
-    664:666:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1285:1287 -> a
-    667:671:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1286:1290 -> a
-    672:672:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1280:1280 -> a
-    673:675:void addConstString(int,com.android.tools.r8.graph.DexString):1298:1300 -> a
-    676:678:com.android.tools.r8.ir.code.Monitor addMonitor(com.android.tools.r8.ir.code.Monitor$Type,int):1335:1337 -> a
-    679:680:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1346:1347 -> a
-    681:681:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2375:2375 -> a
-    681:681:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1349 -> a
-    682:684:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1350:1352 -> a
-    685:685:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> a
-    685:685:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1352 -> a
-    686:687:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1357:1358 -> a
-    688:688:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> a
-    688:688:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1358 -> a
-    689:689:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1361:1361 -> a
-    690:691:void addNop():1387:1388 -> a
-    692:692:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> a
-    692:692:void addNop():1388 -> a
-    693:699:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1467:1473 -> a
-    700:700:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1481:1481 -> a
-    701:704:void com.android.tools.r8.ir.conversion.IRBuilder.addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1494:1497 -> a
-    701:704:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1479 -> a
-    705:708:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1494:1497 -> a
-    709:713:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1502:1506 -> a
-    714:718:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1504:1508 -> a
-    719:719:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> a
-    719:719:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1510 -> a
-    720:722:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1514:1516 -> a
-    723:723:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> a
-    723:723:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1518 -> a
-    724:726:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1530:1532 -> a
-    727:727:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    727:727:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokePolymorphic():1699 -> a
-    727:727:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1532 -> a
-    728:728:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokePolymorphic():1699:1699 -> a
-    728:728:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1532 -> a
-    729:729:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1656:1656 -> a
-    729:729:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokePolymorphic():1699 -> a
-    729:729:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1532 -> a
-    730:730:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1537:1537 -> a
-    731:731:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    731:731:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokePolymorphicOnVarHandle():1695 -> a
-    731:731:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1537 -> a
-    732:732:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokePolymorphicOnVarHandle():1695:1695 -> a
-    732:732:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1537 -> a
-    733:733:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1656:1656 -> a
-    733:733:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokePolymorphicOnVarHandle():1695 -> a
-    733:733:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1537 -> a
-    734:736:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1537:1539 -> a
-    737:749:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1533:1545 -> a
-    750:754:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1555:1559 -> a
-    755:758:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1558:1561 -> a
-    759:776:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1588:1605 -> a
-    777:781:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1610:1614 -> a
-    782:785:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1613:1616 -> a
-    786:809:void addInvokeRegisters(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int[]):1627:1650 -> a
-    810:826:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1654:1670 -> a
-    827:851:void addInvokeRange(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int):1691:1715 -> a
-    852:866:void addInvokeRangeNewArray(com.android.tools.r8.graph.DexType,int,int):1719:1733 -> a
-    867:867:boolean lambda$addMoveException$2(com.android.tools.r8.ir.code.BasicBlock):1746:1746 -> a
-    868:868:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
-    868:868:boolean lambda$addMoveException$2(com.android.tools.r8.ir.code.BasicBlock):1746 -> a
-    869:872:void addNewArrayFilledData(int,int,long,short[]):1817:1820 -> a
-    873:873:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> a
-    873:873:void addNewArrayFilledData(int,int,long,short[]):1821 -> a
-    874:876:void addNewUnboxedEnumInstance(int,com.android.tools.r8.graph.DexType,int):1833:1835 -> a
-    877:877:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> a
-    877:877:void addNewUnboxedEnumInstance(int,com.android.tools.r8.graph.DexType,int):1837 -> a
-    878:881:void addStaticGet(int,com.android.tools.r8.graph.DexField):1875:1878 -> a
-    882:886:void addStaticGet(int,com.android.tools.r8.graph.DexField):1876:1880 -> a
-    887:887:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> a
-    887:887:void addStaticGet(int,com.android.tools.r8.graph.DexField):1882 -> a
-    888:931:void addSwitch(int,int[],int,int[]):1914:1957 -> a
-    932:932:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
-    932:932:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
-    932:932:void addSwitch(int,int[],int,int[]):1962 -> a
-    933:933:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
-    933:933:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
-    933:933:void addSwitch(int,int[],int,int[]):1963 -> a
-    934:938:com.android.tools.r8.ir.code.IntSwitch com.android.tools.r8.ir.conversion.IRBuilder.createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1970:1974 -> a
-    934:938:void addSwitch(int,int[],int,int[]):1964 -> a
-    939:939:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2603:2603 -> a
-    939:939:com.android.tools.r8.ir.code.IntSwitch com.android.tools.r8.ir.conversion.IRBuilder.createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1976 -> a
-    939:939:void addSwitch(int,int[],int,int[]):1964 -> a
-    940:963:com.android.tools.r8.ir.code.IntSwitch com.android.tools.r8.ir.conversion.IRBuilder.createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1977:2000 -> a
-    940:963:void addSwitch(int,int[],int,int[]):1964 -> a
-    964:964:void addSwitch(int,int[],int,int[]):1965:1965 -> a
-    965:966:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2170:2171 -> a
-    967:986:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2186:2205 -> a
-    967:986:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    987:997:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2277:2287 -> a
-    987:997:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2210 -> a
-    987:997:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    998:998:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isPrecise():36:36 -> a
-    998:998:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2287 -> a
-    998:998:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2210 -> a
-    998:998:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    999:1000:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2287:2288 -> a
-    999:1000:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2210 -> a
-    999:1000:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    1001:1001:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isObject():24:24 -> a
-    1001:1001:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2288 -> a
-    1001:1001:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2210 -> a
-    1001:1001:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    1002:1002:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2288:2288 -> a
-    1002:1002:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2210 -> a
-    1002:1002:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    1003:1013:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():161:171 -> a
-    1003:1013:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2288 -> a
-    1003:1013:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2210 -> a
-    1003:1013:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    1014:1014:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():167:167 -> a
-    1014:1014:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2288 -> a
-    1014:1014:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2210 -> a
-    1014:1014:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    1015:1015:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():165:165 -> a
-    1015:1015:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2288 -> a
-    1015:1015:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2210 -> a
-    1015:1015:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    1016:1016:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():163:163 -> a
-    1016:1016:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2288 -> a
-    1016:1016:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2210 -> a
-    1016:1016:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    1017:1035:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2289:2307 -> a
-    1017:1035:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2210 -> a
-    1017:1035:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    1036:1036:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2278:2278 -> a
-    1036:1036:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2210 -> a
-    1036:1036:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    1037:1039:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocalAtBlock(int,com.android.tools.r8.ir.code.BasicBlock):2269:2271 -> a
-    1037:1039:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2212 -> a
-    1037:1039:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    1040:1062:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):68:90 -> a
-    1040:1062:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2213 -> a
-    1040:1062:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    1063:1063:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):88:88 -> a
-    1063:1063:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2213 -> a
-    1063:1063:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    1064:1064:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):86:86 -> a
-    1064:1064:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2213 -> a
-    1064:1064:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    1065:1065:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):84:84 -> a
-    1065:1065:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2213 -> a
-    1065:1065:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    1066:1078:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):70:82 -> a
-    1066:1078:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2213 -> a
-    1066:1078:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    1079:1079:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):80:80 -> a
-    1079:1079:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2213 -> a
-    1079:1079:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    1080:1080:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):78:78 -> a
-    1080:1080:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2213 -> a
-    1080:1080:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    1081:1081:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):76:76 -> a
-    1081:1081:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2213 -> a
-    1081:1081:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    1082:1105:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2214:2237 -> a
-    1082:1105:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    1106:1142:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2228:2264 -> a
-    1106:1142:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2174 -> a
-    1143:1143:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> a
-    1143:1143:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1118 -> a
-    1144:1144:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> a
-    1144:1144:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1119 -> a
-    1145:1145:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> a
-    1145:1145:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1120 -> a
-    1146:1147:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1121:1122 -> a
-    1148:1148:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> a
-    1148:1148:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1123 -> a
-    1149:1149:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> a
-    1149:1149:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1220 -> a
-    1150:1150:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> a
-    1150:1150:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1221 -> a
-    1151:1154:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1222:1225 -> a
-    1155:1155:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> a
-    1155:1155:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2126 -> a
-    1156:1156:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> a
-    1156:1156:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2127 -> a
-    1157:1158:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2128:2129 -> a
-    1159:1159:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> a
-    1159:1159:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2130 -> a
-    1160:1160:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> a
-    1160:1160:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1785 -> a
-    1161:1161:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> a
-    1161:1161:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1786 -> a
-    1162:1163:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1787:1788 -> a
-    1164:1164:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> a
-    1164:1164:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1789 -> a
-    1165:1168:com.android.tools.r8.ir.code.Value readIntLiteral(long):2332:2335 -> a
-    1169:1171:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo,com.android.tools.r8.graph.DebugLocalInfo):2342:2344 -> a
-    1172:1172:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocal(int):2371:2371 -> a
-    1172:1172:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2136 -> a
-    1173:1177:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2137:2141 -> a
-    1178:1178:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():533:533 -> a
-    1178:1178:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2141 -> a
-    1179:1179:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> a
-    1179:1179:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():533 -> a
-    1179:1179:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2141 -> a
-    1180:1190:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2142:2152 -> a
-    1191:1195:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2150:2154 -> a
-    1196:1196:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocal(int):2371:2371 -> a
-    1196:1196:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2349 -> a
-    1197:1197:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2375:2375 -> a
-    1197:1197:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2350 -> a
-    1198:1199:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2362:2363 -> a
-    1200:1200:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2375:2375 -> a
-    1200:1200:void addBooleanNonThisArgument(int):1020 -> a
-    1201:1202:void addBooleanNonThisArgument(int):1021:1022 -> a
-    1203:1203:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2375:2375 -> a
-    1203:1203:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1014 -> a
-    1204:1205:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1015:1016 -> a
-    1206:1206:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2445:2445 -> a
-    1207:1211:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2477:2481 -> a
-    1207:1211:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2445 -> a
-    1212:1212:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    1212:1212:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2481 -> a
-    1212:1212:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2445 -> a
-    1213:1213:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2481:2481 -> a
-    1213:1213:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2445 -> a
-    1214:1214:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2478:2478 -> a
-    1214:1214:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2445 -> a
-    1215:1240:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2446:2471 -> a
-    1241:1245:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2460:2464 -> a
-    1246:1252:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2462:2468 -> a
-    1253:1253:boolean com.android.tools.r8.ir.conversion.IRBuilder.isOffsetProcessed(int):2542:2542 -> a
-    1253:1253:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.ensureBlock(int):2535 -> a
-    1253:1253:void ensureSuccessorBlock(int,int,boolean):2571 -> a
-    1254:1256:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.ensureBlock(int):2536:2538 -> a
-    1254:1256:void ensureSuccessorBlock(int,int,boolean):2571 -> a
-    1257:1260:int com.android.tools.r8.ir.conversion.IRBuilder.getBlockStartOffset(int):2526:2529 -> a
-    1257:1260:void ensureSuccessorBlock(int,int,boolean):2572 -> a
-    1261:1261:void ensureSuccessorBlock(int,int,boolean):2573:2573 -> a
-    1262:1262:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalSuccessor(int):286:286 -> a
-    1262:1262:void ensureSuccessorBlock(int,int,boolean):2575 -> a
-    1263:1263:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalPredecessor(int):282:282 -> a
-    1263:1263:void ensureSuccessorBlock(int,int,boolean):2576 -> a
-    1264:1264:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalSuccessor(int):299:299 -> a
-    1264:1264:void ensureSuccessorBlock(int,int,boolean):2578 -> a
-    1265:1265:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):295:295 -> a
-    1265:1265:void ensureSuccessorBlock(int,int,boolean):2579 -> a
-    1266:1266:void ensureSuccessorBlock(int,int,boolean):2581:2581 -> a
-    1267:1267:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2603:2603 -> a
-    1267:1267:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1438 -> a
-    1268:1268:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2603:2603 -> a
-    1268:1268:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1439 -> a
-    1269:1274:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1440:1445 -> a
-    1275:1278:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2620:2623 -> a
-    1279:1279:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2622:2622 -> a
-    1280:1282:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2637:2639 -> a
-    1280:1282:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2624 -> a
-    1283:1283:int com.android.tools.r8.ir.conversion.IRBuilder.getOffset(com.android.tools.r8.ir.code.BasicBlock):2607:2607 -> a
-    1283:1283:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2599 -> a
-    1283:1283:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2639 -> a
-    1283:1283:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2624 -> a
-    1284:1284:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(int):2595:2595 -> a
-    1284:1284:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2599 -> a
-    1284:1284:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2639 -> a
-    1284:1284:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2624 -> a
-    1285:1285:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2640:2640 -> a
-    1285:1285:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2624 -> a
-    1286:1287:boolean com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.hasMoreThanASingleNormalExit():314:315 -> a
-    1286:1287:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2641 -> a
-    1286:1287:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2624 -> a
-    1288:1288:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2644:2644 -> a
-    1288:1288:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2624 -> a
-    1289:1289:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(int):2595:2595 -> a
-    1289:1289:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2645 -> a
-    1289:1289:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2624 -> a
-    1290:1290:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():303:303 -> a
-    1290:1290:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2646 -> a
-    1290:1290:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2624 -> a
-    1291:1301:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2649:2659 -> a
-    1291:1301:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2624 -> a
-    1302:1310:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2656:2664 -> a
-    1302:1310:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2624 -> a
-    1311:1316:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.createSplitEdgeBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2680:2685 -> a
-    1311:1316:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2664 -> a
-    1311:1316:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2624 -> a
-    1317:1324:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2665:2672 -> a
-    1317:1324:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2624 -> a
-    1325:1327:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():307:309 -> a
-    1325:1327:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2675 -> a
-    1325:1327:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2624 -> a
-    1328:1328:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2675:2675 -> a
-    1328:1328:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2624 -> a
-    1329:1329:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> a
-    1329:1329:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2625 -> a
-    1330:1330:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2626:2626 -> a
-    1331:1331:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2774:2774 -> a
+    1:1:void <clinit>():156:156 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.ir.code.NumberGenerator):475:475 -> <init>
+    2:112:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.ir.code.NumberGenerator):374:484 -> <init>
+    1:21:com.android.tools.r8.ir.analysis.type.TypeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):161:181 -> a
+    22:22:com.android.tools.r8.ir.analysis.type.TypeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):176:176 -> a
+    23:27:com.android.tools.r8.ir.analysis.type.TypeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):170:174 -> a
+    28:28:com.android.tools.r8.ir.analysis.type.TypeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):172:172 -> a
+    29:29:com.android.tools.r8.ir.analysis.type.TypeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):168:168 -> a
+    30:43:com.android.tools.r8.ir.analysis.type.TypeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):166:179 -> a
+    44:44:com.android.tools.r8.ir.conversion.IRBuilder create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin):437:437 -> a
+    45:45:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.ir.conversion.IRBuilder.lookupPrototypeChanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):458:458 -> a
+    45:45:com.android.tools.r8.ir.conversion.IRBuilder create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin):442 -> a
+    46:46:com.android.tools.r8.ir.conversion.IRBuilder create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin):442:442 -> a
+    47:47:com.android.tools.r8.ir.conversion.IRBuilder createForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.graph.RewrittenPrototypeDescription):453:453 -> a
+    48:49:void addToWorklist(com.android.tools.r8.ir.code.BasicBlock,int):518:519 -> a
+    50:57:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):529:536 -> a
+    58:61:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int):992:995 -> a
+    58:61:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):537 -> a
+    62:62:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2395:2395 -> a
+    62:62:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1000 -> a
+    62:62:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int):996 -> a
+    62:62:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):537 -> a
+    63:64:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1001:1002 -> a
+    63:64:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int):996 -> a
+    63:64:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):537 -> a
+    65:65:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> a
+    65:65:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1002 -> a
+    65:65:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int):996 -> a
+    65:65:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):537 -> a
+    66:67:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1003:1004 -> a
+    66:67:void com.android.tools.r8.ir.conversion.IRBuilder.addThisArgument(int):996 -> a
+    66:67:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):537 -> a
+    68:82:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):543:557 -> a
+    83:83:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):556:556 -> a
+    84:87:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1041:1044 -> a
+    84:87:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1036 -> a
+    84:87:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):558 -> a
+    88:88:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2395:2395 -> a
+    88:88:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1046 -> a
+    88:88:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1036 -> a
+    88:88:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):558 -> a
+    89:91:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1047:1049 -> a
+    89:91:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1036 -> a
+    89:91:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):558 -> a
+    92:92:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNull():41:41 -> a
+    92:92:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1049 -> a
+    92:92:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1036 -> a
+    92:92:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):558 -> a
+    93:94:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1050:1051 -> a
+    93:94:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1036 -> a
+    93:94:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):558 -> a
+    95:95:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):58:58 -> a
+    95:95:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1051 -> a
+    95:95:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1036 -> a
+    95:95:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):558 -> a
+    96:101:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1052:1057 -> a
+    96:101:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1036 -> a
+    96:101:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):558 -> a
+    102:109:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1053:1060 -> a
+    102:109:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1036 -> a
+    102:109:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):558 -> a
+    110:110:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo.defaultForInstruction(com.android.tools.r8.ir.code.Instruction):128:128 -> a
+    110:110:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1061 -> a
+    110:110:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1036 -> a
+    110:110:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):558 -> a
+    111:112:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeRegister(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2363:2364 -> a
+    111:112:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1058 -> a
+    111:112:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1036 -> a
+    111:112:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):558 -> a
+    113:113:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1062:1062 -> a
+    113:113:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1036 -> a
+    113:113:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):558 -> a
+    114:114:boolean com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo.isNeverUsed():119:119 -> a
+    114:114:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1064 -> a
+    114:114:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1036 -> a
+    114:114:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):558 -> a
+    115:115:void com.android.tools.r8.ir.conversion.IRBuilder.handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1064:1064 -> a
+    115:115:void com.android.tools.r8.ir.conversion.IRBuilder.addConstantOrUnusedArgument(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo):1036 -> a
+    115:115:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):558 -> a
+    116:119:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):561:564 -> a
+    120:148:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):563:591 -> a
+    149:150:void com.android.tools.r8.ir.conversion.IRBuilder.addExtraUnusedNullArgument(int):1011:1012 -> a
+    149:150:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):592 -> a
+    151:155:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):594:598 -> a
+    156:174:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):608:626 -> a
+    175:177:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2574:2576 -> a
+    175:177:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):631 -> a
+    178:179:void com.android.tools.r8.ir.conversion.IRBuilder.ensureSubroutineProcessedInstructions():2584:2585 -> a
+    178:179:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2579 -> a
+    178:179:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):631 -> a
+    180:180:void com.android.tools.r8.ir.conversion.IRBuilder.markIndexProcessed(int):2580:2580 -> a
+    180:180:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):631 -> a
+    181:191:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):632:642 -> a
+    192:192:void com.android.tools.r8.ir.conversion.IRBuilder.ensureNormalSuccessorBlock(int,int):2605:2605 -> a
+    192:192:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):643 -> a
+    193:195:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):649:651 -> a
+    196:196:void com.android.tools.r8.ir.conversion.IRBuilder.setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):524:524 -> a
+    196:196:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):651 -> a
+    197:202:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):652:657 -> a
+    203:208:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():889:894 -> a
+    203:208:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):658 -> a
+    209:209:void com.android.tools.r8.ir.conversion.IRBuilder.setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):524:524 -> a
+    209:209:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():894 -> a
+    209:209:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):658 -> a
+    210:214:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():895:899 -> a
+    210:214:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):658 -> a
+    215:239:void com.android.tools.r8.ir.conversion.IRBuilder.processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):940:964 -> a
+    215:239:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():899 -> a
+    215:239:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):658 -> a
+    240:245:void com.android.tools.r8.ir.conversion.IRBuilder.processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):963:968 -> a
+    240:245:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():899 -> a
+    240:245:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):658 -> a
+    246:253:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():900:907 -> a
+    246:253:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):658 -> a
+    254:264:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():906:916 -> a
+    254:264:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):658 -> a
+    265:265:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> a
+    265:265:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():916 -> a
+    265:265:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):658 -> a
+    266:275:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():920:929 -> a
+    266:275:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):658 -> a
+    276:279:void com.android.tools.r8.ir.conversion.IRBuilder.closeCurrentBlockWithFallThrough(com.android.tools.r8.ir.code.BasicBlock):2650:2653 -> a
+    276:279:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():929 -> a
+    276:279:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):658 -> a
+    280:281:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():932:933 -> a
+    280:281:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):658 -> a
+    282:282:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():889:889 -> a
+    282:282:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):658 -> a
+    283:283:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):661:661 -> a
+    284:285:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():828:829 -> a
+    284:285:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):666 -> a
+    286:291:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):835:840 -> a
+    286:291:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():829 -> a
+    286:291:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):666 -> a
+    292:292:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():305:305 -> a
+    292:292:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):840 -> a
+    292:292:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():829 -> a
+    292:292:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):666 -> a
+    293:299:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):857:863 -> a
+    293:299:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):840 -> a
+    293:299:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():829 -> a
+    293:299:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):666 -> a
+    300:301:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):880:881 -> a
+    300:301:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):864 -> a
+    300:301:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):840 -> a
+    300:301:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():829 -> a
+    300:301:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):666 -> a
+    302:302:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
+    302:302:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):881 -> a
+    302:302:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):864 -> a
+    302:302:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):840 -> a
+    302:302:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():829 -> a
+    302:302:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):666 -> a
+    303:304:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):882:883 -> a
+    303:304:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):864 -> a
+    303:304:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):840 -> a
+    303:304:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():829 -> a
+    303:304:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):666 -> a
+    305:305:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):881:881 -> a
+    305:305:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):864 -> a
+    305:305:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):840 -> a
+    305:305:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():829 -> a
+    305:305:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):666 -> a
+    306:313:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):868:875 -> a
+    306:313:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):840 -> a
+    306:313:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():829 -> a
+    306:313:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):666 -> a
+    314:320:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):840:846 -> a
+    314:320:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():829 -> a
+    314:320:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):666 -> a
+    321:321:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):843:843 -> a
+    321:321:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():829 -> a
+    321:321:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):666 -> a
+    322:330:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():797:805 -> a
+    322:330:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):669 -> a
+    331:331:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
+    331:331:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():806 -> a
+    331:331:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):669 -> a
+    332:332:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():807:807 -> a
+    332:332:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):669 -> a
+    333:333:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
+    333:333:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():809 -> a
+    333:333:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):669 -> a
+    334:341:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():810:817 -> a
+    334:341:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):669 -> a
+    342:342:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():38:38 -> a
+    342:342:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():818 -> a
+    342:342:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):669 -> a
+    343:343:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):38:38 -> a
+    343:343:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():819 -> a
+    343:343:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):669 -> a
+    344:344:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():820:820 -> a
+    344:344:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):669 -> a
+    345:346:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):672:673 -> a
+    347:347:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
+    347:347:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):673 -> a
+    348:350:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):674:676 -> a
+    351:351:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():38:38 -> a
+    351:351:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):676 -> a
+    352:357:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):677:682 -> a
+    358:358:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):38:38 -> a
+    358:358:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):683 -> a
+    359:360:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):690:691 -> a
+    361:391:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2738:2768 -> a
+    361:391:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):696 -> a
+    392:392:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
+    392:392:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2768 -> a
+    392:392:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):696 -> a
+    393:393:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2768:2768 -> a
+    393:393:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):696 -> a
+    394:408:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2767:2781 -> a
+    394:408:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):696 -> a
+    409:420:void com.android.tools.r8.ir.code.BasicBlock.removePredecessorsByIndex(java.util.List):571:582 -> a
+    409:420:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2785 -> a
+    409:420:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):696 -> a
+    421:421:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2786:2786 -> a
+    421:421:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):696 -> a
+    422:422:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2744:2744 -> a
+    422:422:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):696 -> a
+    423:423:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    423:423:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2744 -> a
+    423:423:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):696 -> a
+    424:424:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    424:424:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    424:424:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2744 -> a
+    424:424:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):696 -> a
+    425:469:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2744:2788 -> a
+    425:469:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):696 -> a
+    470:484:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):699:713 -> a
+    485:485:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1218:1218 -> a
+    485:485:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):716 -> a
+    486:500:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):717:731 -> a
+    501:501:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    501:501:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):731 -> a
+    502:502:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):731:731 -> a
+    503:503:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):727:727 -> a
+    504:504:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    504:504:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):727 -> a
+    505:505:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):727:727 -> a
+    506:524:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):722:740 -> a
+    525:525:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.isConcreteCallSiteOptimizationInfo():0:0 -> a
+    525:525:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):740 -> a
+    526:531:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):740:745 -> a
+    532:532:boolean com.android.tools.r8.graph.AppView.hasLiveness():616:616 -> a
+    532:532:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):745 -> a
+    533:541:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):746:754 -> a
+    542:550:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):751:759 -> a
+    551:551:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1775:1775 -> a
+    551:551:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):759 -> a
+    552:552:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):760:760 -> a
+    553:564:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):127:138 -> a
+    553:564:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    553:564:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):760 -> a
+    565:565:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854:854 -> a
+    565:565:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):138 -> a
+    565:565:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    565:565:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):760 -> a
+    566:574:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):147:155 -> a
+    566:574:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    566:574:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):760 -> a
+    575:575:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854:854 -> a
+    575:575:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):155 -> a
+    575:575:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    575:575:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):760 -> a
+    576:580:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):168:172 -> a
+    576:580:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    576:580:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):760 -> a
+    581:581:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):113:113 -> a
+    581:581:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):760 -> a
+    582:582:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo.builder(com.android.tools.r8.graph.DexItemFactory):271:271 -> a
+    582:582:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.convertRewritingCandidateToStringSwitchInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory):178 -> a
+    582:582:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):114 -> a
+    582:582:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):760 -> a
+    583:585:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.convertRewritingCandidateToStringSwitchInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory):178:180 -> a
+    583:585:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):114 -> a
+    583:585:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):760 -> a
+    586:587:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):119:120 -> a
+    586:587:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):760 -> a
+    588:592:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):763:767 -> a
+    593:594:boolean allPhisAreStackMapPhis(com.android.tools.r8.ir.code.IRCode):777:778 -> a
+    595:595:void constrainType(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):786:786 -> a
+    596:596:void resolveAndBuildSwitch(int,int,int):973:973 -> a
+    597:597:void add(com.android.tools.r8.ir.code.Instruction):987:987 -> a
+    598:598:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> a
+    598:598:void add(com.android.tools.r8.ir.code.Instruction):988 -> a
+    599:600:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):1028:1029 -> a
+    601:601:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> a
+    601:601:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):1031 -> a
+    602:602:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):1032:1032 -> a
+    603:607:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1101:1105 -> a
+    608:608:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():533:533 -> a
+    608:608:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1078 -> a
+    608:608:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1106 -> a
+    609:609:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> a
+    609:609:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():533 -> a
+    609:609:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1078 -> a
+    609:609:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1106 -> a
+    610:610:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1078:1078 -> a
+    610:610:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1106 -> a
+    611:611:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1107:1107 -> a
+    612:618:void addDebugPosition(com.android.tools.r8.ir.code.Position):1112:1118 -> a
+    619:619:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> a
+    619:619:void addDebugPosition(com.android.tools.r8.ir.code.Position):1118 -> a
+    620:624:void addDebugPosition(com.android.tools.r8.ir.code.Position):1125:1129 -> a
+    625:625:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> a
+    625:625:void addDebugPosition(com.android.tools.r8.ir.code.Position):1129 -> a
+    626:635:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1173:1182 -> a
+    636:636:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
+    636:636:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1182 -> a
+    637:646:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1182:1191 -> a
+    647:650:void com.android.tools.r8.ir.conversion.IRBuilder.addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):790:793 -> a
+    647:650:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1192 -> a
+    651:651:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1194:1194 -> a
+    652:656:void addArrayLength(int,int):1198:1202 -> a
+    657:657:void addCheckCast(int,com.android.tools.r8.graph.DexType):1217:1217 -> a
+    658:665:void internalAddCheckCast(int,com.android.tools.r8.graph.DexType,boolean):1225:1232 -> a
+    666:669:void addConst(com.android.tools.r8.ir.analysis.type.TypeElement,int,long):1245:1248 -> a
+    670:670:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1280:1280 -> a
+    671:671:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    671:671:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodHandle():1703 -> a
+    671:671:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1280 -> a
+    672:672:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodHandle():1703:1703 -> a
+    672:672:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1280 -> a
+    673:673:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1656:1656 -> a
+    673:673:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodHandle():1703 -> a
+    673:673:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1280 -> a
+    674:676:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1286:1288 -> a
+    677:681:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1287:1291 -> a
+    682:682:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1281:1281 -> a
+    683:683:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1295:1295 -> a
+    684:684:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    684:684:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodType():1707 -> a
+    684:684:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1295 -> a
+    685:685:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodType():1707:1707 -> a
+    685:685:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1295 -> a
+    686:686:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1656:1656 -> a
+    686:686:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodType():1707 -> a
+    686:686:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1295 -> a
+    687:689:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1301:1303 -> a
+    690:694:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1302:1306 -> a
+    695:695:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1296:1296 -> a
+    696:698:void addConstString(int,com.android.tools.r8.graph.DexString):1314:1316 -> a
+    699:701:com.android.tools.r8.ir.code.Monitor addMonitor(com.android.tools.r8.ir.code.Monitor$Type,int):1351:1353 -> a
+    702:703:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1362:1363 -> a
+    704:704:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2395:2395 -> a
+    704:704:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1365 -> a
+    705:707:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1366:1368 -> a
+    708:708:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> a
+    708:708:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1368 -> a
+    709:710:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1373:1374 -> a
+    711:711:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> a
+    711:711:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1374 -> a
+    712:712:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1377:1377 -> a
+    713:714:void addNop():1403:1404 -> a
+    715:715:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> a
+    715:715:void addNop():1404 -> a
+    716:722:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1483:1489 -> a
+    723:723:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1497:1497 -> a
+    724:727:void com.android.tools.r8.ir.conversion.IRBuilder.addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1510:1513 -> a
+    724:727:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1495 -> a
+    728:731:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1510:1513 -> a
+    732:736:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1518:1522 -> a
+    737:741:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1520:1524 -> a
+    742:742:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> a
+    742:742:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1526 -> a
+    743:745:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1530:1532 -> a
+    746:746:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> a
+    746:746:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1534 -> a
+    747:749:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1546:1548 -> a
+    750:750:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    750:750:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokePolymorphic():1699 -> a
+    750:750:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1548 -> a
+    751:751:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokePolymorphic():1699:1699 -> a
+    751:751:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1548 -> a
+    752:752:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1656:1656 -> a
+    752:752:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokePolymorphic():1699 -> a
+    752:752:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1548 -> a
+    753:753:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1553:1553 -> a
+    754:754:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    754:754:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokePolymorphicOnVarHandle():1695 -> a
+    754:754:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1553 -> a
+    755:755:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokePolymorphicOnVarHandle():1695:1695 -> a
+    755:755:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1553 -> a
+    756:756:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1656:1656 -> a
+    756:756:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokePolymorphicOnVarHandle():1695 -> a
+    756:756:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1553 -> a
+    757:759:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1553:1555 -> a
+    760:772:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1549:1561 -> a
+    773:777:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1571:1575 -> a
+    778:781:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1574:1577 -> a
+    782:799:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1604:1621 -> a
+    800:804:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1626:1630 -> a
+    805:808:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1629:1632 -> a
+    809:832:void addInvokeRegisters(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int[]):1643:1666 -> a
+    833:849:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1670:1686 -> a
+    850:874:void addInvokeRange(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int):1707:1731 -> a
+    875:889:void addInvokeRangeNewArray(com.android.tools.r8.graph.DexType,int,int):1735:1749 -> a
+    890:890:boolean lambda$addMoveException$2(com.android.tools.r8.ir.code.BasicBlock):1762:1762 -> a
+    891:891:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
+    891:891:boolean lambda$addMoveException$2(com.android.tools.r8.ir.code.BasicBlock):1762 -> a
+    892:895:void addNewArrayFilledData(int,int,long,short[]):1833:1836 -> a
+    896:896:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> a
+    896:896:void addNewArrayFilledData(int,int,long,short[]):1837 -> a
+    897:899:void addNewUnboxedEnumInstance(int,com.android.tools.r8.graph.DexType,int):1849:1851 -> a
+    900:900:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> a
+    900:900:void addNewUnboxedEnumInstance(int,com.android.tools.r8.graph.DexType,int):1853 -> a
+    901:904:void addStaticGet(int,com.android.tools.r8.graph.DexField):1891:1894 -> a
+    905:909:void addStaticGet(int,com.android.tools.r8.graph.DexField):1892:1896 -> a
+    910:910:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> a
+    910:910:void addStaticGet(int,com.android.tools.r8.graph.DexField):1898 -> a
+    911:954:void addSwitch(int,int[],int,int[]):1930:1973 -> a
+    955:955:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
+    955:955:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
+    955:955:void addSwitch(int,int[],int,int[]):1978 -> a
+    956:956:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
+    956:956:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
+    956:956:void addSwitch(int,int[],int,int[]):1979 -> a
+    957:961:com.android.tools.r8.ir.code.IntSwitch com.android.tools.r8.ir.conversion.IRBuilder.createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1986:1990 -> a
+    957:961:void addSwitch(int,int[],int,int[]):1980 -> a
+    962:962:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2623:2623 -> a
+    962:962:com.android.tools.r8.ir.code.IntSwitch com.android.tools.r8.ir.conversion.IRBuilder.createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1992 -> a
+    962:962:void addSwitch(int,int[],int,int[]):1980 -> a
+    963:986:com.android.tools.r8.ir.code.IntSwitch com.android.tools.r8.ir.conversion.IRBuilder.createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1993:2016 -> a
+    963:986:void addSwitch(int,int[],int,int[]):1980 -> a
+    987:987:void addSwitch(int,int[],int,int[]):1981:1981 -> a
+    988:989:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2186:2187 -> a
+    990:1009:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2202:2221 -> a
+    990:1009:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1010:1020:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2293:2303 -> a
+    1010:1020:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2226 -> a
+    1010:1020:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1021:1021:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isPrecise():36:36 -> a
+    1021:1021:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2303 -> a
+    1021:1021:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2226 -> a
+    1021:1021:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1022:1023:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2303:2304 -> a
+    1022:1023:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2226 -> a
+    1022:1023:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1024:1024:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isObject():24:24 -> a
+    1024:1024:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2304 -> a
+    1024:1024:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2226 -> a
+    1024:1024:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1025:1025:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2304:2304 -> a
+    1025:1025:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2226 -> a
+    1025:1025:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1026:1036:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():161:171 -> a
+    1026:1036:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2304 -> a
+    1026:1036:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2226 -> a
+    1026:1036:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1037:1037:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():167:167 -> a
+    1037:1037:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2304 -> a
+    1037:1037:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2226 -> a
+    1037:1037:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1038:1038:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():165:165 -> a
+    1038:1038:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2304 -> a
+    1038:1038:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2226 -> a
+    1038:1038:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1039:1039:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():163:163 -> a
+    1039:1039:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2304 -> a
+    1039:1039:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2226 -> a
+    1039:1039:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1040:1058:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2305:2323 -> a
+    1040:1058:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2226 -> a
+    1040:1058:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1059:1059:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2294:2294 -> a
+    1059:1059:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2226 -> a
+    1059:1059:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1060:1062:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocalAtBlock(int,com.android.tools.r8.ir.code.BasicBlock):2285:2287 -> a
+    1060:1062:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2228 -> a
+    1060:1062:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1063:1085:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):68:90 -> a
+    1063:1085:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2229 -> a
+    1063:1085:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1086:1086:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):88:88 -> a
+    1086:1086:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2229 -> a
+    1086:1086:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1087:1087:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):86:86 -> a
+    1087:1087:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2229 -> a
+    1087:1087:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1088:1088:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):84:84 -> a
+    1088:1088:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2229 -> a
+    1088:1088:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1089:1101:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):70:82 -> a
+    1089:1101:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2229 -> a
+    1089:1101:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1102:1102:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):80:80 -> a
+    1102:1102:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2229 -> a
+    1102:1102:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1103:1103:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):78:78 -> a
+    1103:1103:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2229 -> a
+    1103:1103:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1104:1104:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.TypeConstraintResolver.typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):76:76 -> a
+    1104:1104:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2229 -> a
+    1104:1104:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1105:1128:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2230:2253 -> a
+    1105:1128:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1129:1165:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2244:2280 -> a
+    1129:1165:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2190 -> a
+    1166:1166:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> a
+    1166:1166:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1134 -> a
+    1167:1167:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> a
+    1167:1167:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1135 -> a
+    1168:1168:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> a
+    1168:1168:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1136 -> a
+    1169:1170:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1137:1138 -> a
+    1171:1171:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> a
+    1171:1171:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1139 -> a
+    1172:1172:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> a
+    1172:1172:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1236 -> a
+    1173:1173:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> a
+    1173:1173:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1237 -> a
+    1174:1177:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1238:1241 -> a
+    1178:1178:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> a
+    1178:1178:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2142 -> a
+    1179:1179:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> a
+    1179:1179:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2143 -> a
+    1180:1181:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2144:2145 -> a
+    1182:1182:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> a
+    1182:1182:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2146 -> a
+    1183:1183:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> a
+    1183:1183:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1801 -> a
+    1184:1184:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> a
+    1184:1184:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1802 -> a
+    1185:1186:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1803:1804 -> a
+    1187:1187:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> a
+    1187:1187:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1805 -> a
+    1188:1191:com.android.tools.r8.ir.code.Value readIntLiteral(long):2348:2351 -> a
+    1192:1193:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo,com.android.tools.r8.graph.DebugLocalInfo):2358:2359 -> a
+    1194:1195:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeRegister(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2363:2364 -> a
+    1194:1195:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo,com.android.tools.r8.graph.DebugLocalInfo):2358 -> a
+    1196:1196:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocal(int):2391:2391 -> a
+    1196:1196:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2152 -> a
+    1197:1201:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2153:2157 -> a
+    1202:1202:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():533:533 -> a
+    1202:1202:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2157 -> a
+    1203:1203:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> a
+    1203:1203:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():533 -> a
+    1203:1203:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2157 -> a
+    1204:1214:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2158:2168 -> a
+    1215:1219:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2166:2170 -> a
+    1220:1220:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocal(int):2391:2391 -> a
+    1220:1220:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2369 -> a
+    1221:1221:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2395:2395 -> a
+    1221:1221:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2370 -> a
+    1222:1223:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2382:2383 -> a
+    1224:1224:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2395:2395 -> a
+    1224:1224:void addBooleanNonThisArgument(int):1022 -> a
+    1225:1226:void addBooleanNonThisArgument(int):1023:1024 -> a
+    1227:1227:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2395:2395 -> a
+    1227:1227:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1016 -> a
+    1228:1229:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1017:1018 -> a
+    1230:1230:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2465:2465 -> a
+    1231:1235:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2497:2501 -> a
+    1231:1235:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2465 -> a
+    1236:1236:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
+    1236:1236:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2501 -> a
+    1236:1236:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2465 -> a
+    1237:1237:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2501:2501 -> a
+    1237:1237:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2465 -> a
+    1238:1238:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2498:2498 -> a
+    1238:1238:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2465 -> a
+    1239:1264:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2466:2491 -> a
+    1265:1269:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2480:2484 -> a
+    1270:1276:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2482:2488 -> a
+    1277:1277:boolean com.android.tools.r8.ir.conversion.IRBuilder.isOffsetProcessed(int):2562:2562 -> a
+    1277:1277:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.ensureBlock(int):2555 -> a
+    1277:1277:void ensureSuccessorBlock(int,int,boolean):2591 -> a
+    1278:1280:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.ensureBlock(int):2556:2558 -> a
+    1278:1280:void ensureSuccessorBlock(int,int,boolean):2591 -> a
+    1281:1284:int com.android.tools.r8.ir.conversion.IRBuilder.getBlockStartOffset(int):2546:2549 -> a
+    1281:1284:void ensureSuccessorBlock(int,int,boolean):2592 -> a
+    1285:1285:void ensureSuccessorBlock(int,int,boolean):2593:2593 -> a
+    1286:1286:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalSuccessor(int):288:288 -> a
+    1286:1286:void ensureSuccessorBlock(int,int,boolean):2595 -> a
+    1287:1287:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalPredecessor(int):284:284 -> a
+    1287:1287:void ensureSuccessorBlock(int,int,boolean):2596 -> a
+    1288:1288:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalSuccessor(int):301:301 -> a
+    1288:1288:void ensureSuccessorBlock(int,int,boolean):2598 -> a
+    1289:1289:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):297:297 -> a
+    1289:1289:void ensureSuccessorBlock(int,int,boolean):2599 -> a
+    1290:1290:void ensureSuccessorBlock(int,int,boolean):2601:2601 -> a
+    1291:1291:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2623:2623 -> a
+    1291:1291:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1454 -> a
+    1292:1292:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2623:2623 -> a
+    1292:1292:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1455 -> a
+    1293:1298:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1456:1461 -> a
+    1299:1302:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2640:2643 -> a
+    1303:1303:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2642:2642 -> a
+    1304:1306:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2657:2659 -> a
+    1304:1306:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2644 -> a
+    1307:1307:int com.android.tools.r8.ir.conversion.IRBuilder.getOffset(com.android.tools.r8.ir.code.BasicBlock):2627:2627 -> a
+    1307:1307:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2619 -> a
+    1307:1307:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2659 -> a
+    1307:1307:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2644 -> a
+    1308:1308:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(int):2615:2615 -> a
+    1308:1308:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2619 -> a
+    1308:1308:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2659 -> a
+    1308:1308:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2644 -> a
+    1309:1309:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2660:2660 -> a
+    1309:1309:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2644 -> a
+    1310:1311:boolean com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.hasMoreThanASingleNormalExit():316:317 -> a
+    1310:1311:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2661 -> a
+    1310:1311:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2644 -> a
+    1312:1312:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2664:2664 -> a
+    1312:1312:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2644 -> a
+    1313:1313:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(int):2615:2615 -> a
+    1313:1313:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2665 -> a
+    1313:1313:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2644 -> a
+    1314:1314:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():305:305 -> a
+    1314:1314:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2666 -> a
+    1314:1314:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2644 -> a
+    1315:1325:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2669:2679 -> a
+    1315:1325:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2644 -> a
+    1326:1334:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2676:2684 -> a
+    1326:1334:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2644 -> a
+    1335:1340:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.createSplitEdgeBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2700:2705 -> a
+    1335:1340:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2684 -> a
+    1335:1340:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2644 -> a
+    1341:1348:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2685:2692 -> a
+    1341:1348:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2644 -> a
+    1349:1351:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():309:311 -> a
+    1349:1351:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2695 -> a
+    1349:1351:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2644 -> a
+    1352:1352:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2695:2695 -> a
+    1352:1352:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2644 -> a
+    1353:1353:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> a
+    1353:1353:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2645 -> a
+    1354:1354:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2646:2646 -> a
+    1355:1355:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2794:2794 -> a
     1:20:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.code.ValueTypeConstraint.fromMemberType(com.android.tools.r8.ir.code.MemberType):63:82 -> b
-    1:20:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1190 -> b
+    1:20:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1206 -> b
     21:21:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.code.ValueTypeConstraint.fromMemberType(com.android.tools.r8.ir.code.MemberType):78:78 -> b
-    21:21:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1190 -> b
+    21:21:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1206 -> b
     22:26:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.code.ValueTypeConstraint.fromMemberType(com.android.tools.r8.ir.code.MemberType):72:76 -> b
-    22:26:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1190 -> b
+    22:26:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1206 -> b
     27:27:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.code.ValueTypeConstraint.fromMemberType(com.android.tools.r8.ir.code.MemberType):74:74 -> b
-    27:27:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1190 -> b
+    27:27:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1206 -> b
     28:28:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.code.ValueTypeConstraint.fromMemberType(com.android.tools.r8.ir.code.MemberType):70:70 -> b
-    28:28:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1190 -> b
+    28:28:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1206 -> b
     29:41:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.code.ValueTypeConstraint.fromMemberType(com.android.tools.r8.ir.code.MemberType):68:80 -> b
-    29:41:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1190 -> b
-    42:46:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1190:1194 -> b
-    47:50:void com.android.tools.r8.ir.conversion.IRBuilder.addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):788:791 -> b
-    47:50:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1195 -> b
-    51:51:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1197:1197 -> b
-    52:65:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):1066:1079 -> b
-    66:66:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> b
-    66:66:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):1080 -> b
-    67:67:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1127:1127 -> b
-    68:68:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> b
-    68:68:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1128 -> b
-    69:69:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1129:1129 -> b
-    70:70:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> b
-    70:70:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1130 -> b
-    71:72:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1131:1132 -> b
-    73:73:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> b
-    73:73:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1133 -> b
-    74:78:void addConstClass(int,com.android.tools.r8.graph.DexType):1256:1260 -> b
-    79:79:void addTrivialIf(int,int):1424:1424 -> b
-    80:80:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2603:2603 -> b
-    80:80:void addTrivialIf(int,int):1428 -> b
-    81:84:void addTrivialIf(int,int):1431:1434 -> b
-    85:88:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1522:1525 -> b
-    89:89:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1674:1674 -> b
-    90:90:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> b
-    90:90:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1674 -> b
-    91:97:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1674:1680 -> b
-    98:102:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1807:1811 -> b
-    103:103:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> b
-    103:103:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1813 -> b
-    104:104:void addReturn():1857:1857 -> b
-    105:107:void com.android.tools.r8.ir.conversion.IRBuilder.addReturn(com.android.tools.r8.ir.code.Return):1862:1864 -> b
-    105:107:void addReturn():1857 -> b
-    108:111:void addStaticPut(int,com.android.tools.r8.graph.DexField):1886:1889 -> b
-    112:112:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> b
-    112:112:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1793 -> b
-    113:113:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> b
-    113:113:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1794 -> b
-    114:117:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1796:1799 -> b
-    118:121:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2316:2319 -> b
-    118:121:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1799 -> b
-    122:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readLongLiteral(long):2325:2328 -> b
-    122:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2320 -> b
-    122:125:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1799 -> b
-    126:128:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1800:1802 -> b
-    129:129:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> b
-    129:129:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1803 -> b
-    130:130:void addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> b
-    131:131:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2603:2603 -> b
-    131:131:void addGoto(int):1416 -> b
-    132:135:void addGoto(int):1417:1420 -> b
-    136:136:boolean isNonLongIntegerType(com.android.tools.r8.ir.code.NumericType):2778:2778 -> b
-    1:1:boolean canUseStackMapTypes():771:771 -> c
-    2:2:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1137:1137 -> c
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> c
-    3:3:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1138 -> c
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> c
-    4:4:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1139 -> c
-    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> c
-    5:5:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1140 -> c
-    6:7:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1141:1142 -> c
-    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> c
-    8:8:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1143 -> c
-    9:9:void checkInvokeArgumentRegisters(int,int):1738:1738 -> c
+    29:41:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1206 -> b
+    42:46:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1206:1210 -> b
+    47:50:void com.android.tools.r8.ir.conversion.IRBuilder.addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):790:793 -> b
+    47:50:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1211 -> b
+    51:51:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1213:1213 -> b
+    52:65:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):1082:1095 -> b
+    66:66:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> b
+    66:66:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):1096 -> b
+    67:67:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1143:1143 -> b
+    68:68:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> b
+    68:68:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1144 -> b
+    69:69:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1145:1145 -> b
+    70:70:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> b
+    70:70:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1146 -> b
+    71:72:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1147:1148 -> b
+    73:73:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> b
+    73:73:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1149 -> b
+    74:78:void addConstClass(int,com.android.tools.r8.graph.DexType):1272:1276 -> b
+    79:79:void addTrivialIf(int,int):1440:1440 -> b
+    80:80:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2623:2623 -> b
+    80:80:void addTrivialIf(int,int):1444 -> b
+    81:84:void addTrivialIf(int,int):1447:1450 -> b
+    85:88:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1538:1541 -> b
+    89:89:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1690:1690 -> b
+    90:90:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> b
+    90:90:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1690 -> b
+    91:97:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1690:1696 -> b
+    98:102:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1823:1827 -> b
+    103:103:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> b
+    103:103:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1829 -> b
+    104:104:void addReturn():1873:1873 -> b
+    105:107:void com.android.tools.r8.ir.conversion.IRBuilder.addReturn(com.android.tools.r8.ir.code.Return):1878:1880 -> b
+    105:107:void addReturn():1873 -> b
+    108:111:void addStaticPut(int,com.android.tools.r8.graph.DexField):1902:1905 -> b
+    112:112:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> b
+    112:112:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1809 -> b
+    113:113:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> b
+    113:113:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1810 -> b
+    114:117:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1812:1815 -> b
+    118:121:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2332:2335 -> b
+    118:121:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1815 -> b
+    122:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readLongLiteral(long):2341:2344 -> b
+    122:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2336 -> b
+    122:125:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1815 -> b
+    126:128:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1816:1818 -> b
+    129:129:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> b
+    129:129:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1819 -> b
+    130:130:void addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> b
+    131:131:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.IRBuilder.getTarget(int):2623:2623 -> b
+    131:131:void addGoto(int):1432 -> b
+    132:135:void addGoto(int):1433:1436 -> b
+    136:136:boolean isNonLongIntegerType(com.android.tools.r8.ir.code.NumericType):2798:2798 -> b
+    1:1:boolean canUseStackMapTypes():773:773 -> c
+    2:2:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1153:1153 -> c
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> c
+    3:3:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1154 -> c
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> c
+    4:4:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1155 -> c
+    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> c
+    5:5:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1156 -> c
+    6:7:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1157:1158 -> c
+    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> c
+    8:8:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1159 -> c
+    9:9:void checkInvokeArgumentRegisters(int,int):1754:1754 -> c
     10:10:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> c
-    10:10:void checkInvokeArgumentRegisters(int,int):1738 -> c
-    11:11:void checkInvokeArgumentRegisters(int,int):1738:1738 -> c
-    12:16:void addMoveException(int):1745:1749 -> c
-    17:19:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1754:1756 -> c
-    17:19:void addMoveException(int):1750 -> c
+    10:10:void checkInvokeArgumentRegisters(int,int):1754 -> c
+    11:11:void checkInvokeArgumentRegisters(int,int):1754:1754 -> c
+    12:16:void addMoveException(int):1761:1765 -> c
+    17:19:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1770:1772 -> c
+    17:19:void addMoveException(int):1766 -> c
     20:20:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> c
-    20:20:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1756 -> c
-    20:20:void addMoveException(int):1750 -> c
-    21:24:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1756:1759 -> c
-    21:24:void addMoveException(int):1750 -> c
+    20:20:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1772 -> c
+    20:20:void addMoveException(int):1766 -> c
+    21:24:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1772:1775 -> c
+    21:24:void addMoveException(int):1766 -> c
     25:25:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> c
-    25:25:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1759 -> c
-    25:25:void addMoveException(int):1750 -> c
-    26:26:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1759:1759 -> c
-    26:26:void addMoveException(int):1750 -> c
-    27:28:void addInitClass(int,com.android.tools.r8.graph.DexType):1868:1869 -> c
-    29:29:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> c
-    29:29:void addInitClass(int,com.android.tools.r8.graph.DexType):1871 -> c
-    30:32:com.android.tools.r8.ir.code.Value readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):2159:2161 -> c
-    33:48:void attachLocalValues(com.android.tools.r8.ir.code.Instruction):2486:2501 -> c
-    1:1:void lambda$allPhisAreStackMapPhis$1(com.android.tools.r8.ir.code.Instruction):778:778 -> d
-    2:2:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1147:1147 -> d
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> d
-    3:3:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1148 -> d
-    4:4:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1149:1149 -> d
-    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> d
-    5:5:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1150 -> d
-    6:7:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1151:1152 -> d
-    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> d
-    8:8:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1153 -> d
-    9:13:void addMoveResult(int):1765:1769 -> d
+    25:25:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1775 -> c
+    25:25:void addMoveException(int):1766 -> c
+    26:26:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1775:1775 -> c
+    26:26:void addMoveException(int):1766 -> c
+    27:28:void addInitClass(int,com.android.tools.r8.graph.DexType):1884:1885 -> c
+    29:29:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> c
+    29:29:void addInitClass(int,com.android.tools.r8.graph.DexType):1887 -> c
+    30:32:com.android.tools.r8.ir.code.Value readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):2175:2177 -> c
+    33:48:void attachLocalValues(com.android.tools.r8.ir.code.Instruction):2506:2521 -> c
+    1:1:void lambda$allPhisAreStackMapPhis$1(com.android.tools.r8.ir.code.Instruction):780:780 -> d
+    2:2:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1163:1163 -> d
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> d
+    3:3:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1164 -> d
+    4:4:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1165:1165 -> d
+    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> d
+    5:5:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1166 -> d
+    6:7:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1167:1168 -> d
+    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> d
+    8:8:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1169 -> d
+    9:13:void addMoveResult(int):1781:1785 -> d
     14:14:boolean com.android.tools.r8.ir.code.Instruction.isInvokeNewArray():0:0 -> d
-    14:14:void addMoveResult(int):1771 -> d
+    14:14:void addMoveResult(int):1787 -> d
     15:15:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMultiNewArray():0:0 -> d
-    15:15:void addMoveResult(int):1771 -> d
-    16:16:void addMoveResult(int):1773:1773 -> d
-    17:17:void addMoveResult(int):1772:1772 -> d
+    15:15:void addMoveResult(int):1787 -> d
+    16:16:void addMoveResult(int):1789:1789 -> d
+    17:17:void addMoveResult(int):1788:1788 -> d
     18:18:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> d
-    18:18:void addMoveResult(int):1777 -> d
-    19:22:void addMoveResult(int):1778:1781 -> d
-    23:25:void addNewInstance(int,com.android.tools.r8.graph.DexType):1825:1827 -> d
-    26:26:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> d
-    26:26:void addNewInstance(int,com.android.tools.r8.graph.DexType):1829 -> d
-    27:27:void ensureExceptionalSuccessorBlock(int,int):2589:2589 -> d
-    28:29:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2611:2612 -> d
-    30:30:void com.android.tools.r8.ir.conversion.IRBuilder.setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):522:522 -> d
-    30:30:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2613 -> d
-    31:33:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2614:2616 -> d
-    1:1:boolean lambda$build$0(com.android.tools.r8.ir.code.Instruction):673:673 -> e
-    2:4:void flushArgumentInstructions():1053:1055 -> e
-    5:5:void addSafeCheckCast(int,com.android.tools.r8.graph.DexType):1205:1205 -> e
-    6:6:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1312:1312 -> e
-    7:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> e
-    7:7:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1313 -> e
-    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> e
-    8:8:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1314 -> e
-    9:9:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> e
-    9:9:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1315 -> e
-    10:12:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1317:1319 -> e
-    13:21:void addReturn(int):1841:1849 -> e
-    22:22:void addReturn(int):1848:1848 -> e
+    18:18:void addMoveResult(int):1793 -> d
+    19:22:void addMoveResult(int):1794:1797 -> d
+    23:25:void addNewInstance(int,com.android.tools.r8.graph.DexType):1841:1843 -> d
+    26:26:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> d
+    26:26:void addNewInstance(int,com.android.tools.r8.graph.DexType):1845 -> d
+    27:27:void ensureExceptionalSuccessorBlock(int,int):2609:2609 -> d
+    28:29:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2631:2632 -> d
+    30:30:void com.android.tools.r8.ir.conversion.IRBuilder.setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):524:524 -> d
+    30:30:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2633 -> d
+    31:33:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2634:2636 -> d
+    1:1:boolean lambda$build$0(com.android.tools.r8.ir.code.Instruction):675:675 -> e
+    2:4:void flushArgumentInstructions():1069:1071 -> e
+    5:5:void addSafeCheckCast(int,com.android.tools.r8.graph.DexType):1221:1221 -> e
+    6:6:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1328:1328 -> e
+    7:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> e
+    7:7:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1329 -> e
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> e
+    8:8:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1330 -> e
+    9:9:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> e
+    9:9:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1331 -> e
+    10:12:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1333:1335 -> e
+    13:21:void addReturn(int):1857:1865 -> e
+    22:22:void addReturn(int):1864:1864 -> e
     23:23:com.android.tools.r8.ir.code.ValueTypeConstraint com.android.tools.r8.ir.code.ValueTypeConstraint.fromDexType(com.android.tools.r8.graph.DexType):111:111 -> e
-    23:23:void addReturn(int):1850 -> e
-    24:25:void addReturn(int):1851:1852 -> e
-    26:28:void com.android.tools.r8.ir.conversion.IRBuilder.addReturn(com.android.tools.r8.ir.code.Return):1862:1864 -> e
-    26:28:void addReturn(int):1852 -> e
-    29:29:void ensureNormalSuccessorBlock(int,int):2585:2585 -> e
-    1:2:java.util.List getArgumentValues():506:507 -> f
-    3:3:void resolveAndBuildNewArrayFilledData(int,int):976:976 -> f
-    4:5:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1323:1324 -> f
-    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> f
-    6:6:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1325 -> f
-    7:7:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1326:1326 -> f
-    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> f
-    8:8:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1327 -> f
-    9:11:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1329:1331 -> f
-    12:16:void addThrow(int):2004:2008 -> f
-    17:17:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> f
-    17:17:void addThrow(int):2008 -> f
-    18:18:void addThrow(int):2009:2009 -> f
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getCFG():502:502 -> g
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> g
-    2:2:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1365 -> g
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> g
-    3:3:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1366 -> g
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> g
-    4:4:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1367 -> g
-    5:6:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1368:1369 -> g
-    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> g
-    7:7:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1370 -> g
-    8:9:void checkRegister(int):2382:2383 -> g
+    23:23:void addReturn(int):1866 -> e
+    24:25:void addReturn(int):1867:1868 -> e
+    26:28:void com.android.tools.r8.ir.conversion.IRBuilder.addReturn(com.android.tools.r8.ir.code.Return):1878:1880 -> e
+    26:28:void addReturn(int):1868 -> e
+    29:29:void ensureNormalSuccessorBlock(int,int):2605:2605 -> e
+    1:2:java.util.List getArgumentValues():508:509 -> f
+    3:3:void resolveAndBuildNewArrayFilledData(int,int):978:978 -> f
+    4:5:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1339:1340 -> f
+    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> f
+    6:6:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1341 -> f
+    7:7:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1342:1342 -> f
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> f
+    8:8:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1343 -> f
+    9:11:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1345:1347 -> f
+    12:16:void addThrow(int):2020:2024 -> f
+    17:17:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> f
+    17:17:void addThrow(int):2024 -> f
+    18:18:void addThrow(int):2025:2025 -> f
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getCFG():504:504 -> g
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> g
+    2:2:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1381 -> g
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> g
+    3:3:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1382 -> g
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> g
+    4:4:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1383 -> g
+    5:6:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1384:1385 -> g
+    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> g
+    7:7:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1386 -> g
+    8:9:void checkRegister(int):2402:2403 -> g
     10:10:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> g
-    10:10:void checkRegister(int):2383 -> g
-    11:11:void checkRegister(int):2383:2383 -> g
-    12:12:void checkRegister(int):2380:2380 -> g
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getMethod():486:486 -> h
-    2:2:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1374:1374 -> h
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> h
-    3:3:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1375 -> h
-    4:4:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1376:1376 -> h
-    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> h
-    5:5:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1377 -> h
-    6:7:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1378:1379 -> h
-    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> h
-    8:8:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1380 -> h
-    9:10:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2508:2509 -> h
-    11:11:boolean com.android.tools.r8.ir.conversion.IRBuilder.isOffsetProcessed(int):2542:2542 -> h
-    11:11:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2512 -> h
-    12:15:int com.android.tools.r8.ir.conversion.IRBuilder.getBlockStartOffset(int):2526:2529 -> h
-    12:15:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2513 -> h
-    16:17:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2514:2515 -> h
-    18:19:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):320:321 -> h
-    18:19:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2515 -> h
+    10:10:void checkRegister(int):2403 -> g
+    11:11:void checkRegister(int):2403:2403 -> g
+    12:12:void checkRegister(int):2400:2400 -> g
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getMethod():488:488 -> h
+    2:2:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1390:1390 -> h
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> h
+    3:3:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1391 -> h
+    4:4:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1392:1392 -> h
+    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> h
+    5:5:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1393 -> h
+    6:7:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1394:1395 -> h
+    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> h
+    8:8:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1396 -> h
+    9:10:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2528:2529 -> h
+    11:11:boolean com.android.tools.r8.ir.conversion.IRBuilder.isOffsetProcessed(int):2562:2562 -> h
+    11:11:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2532 -> h
+    12:15:int com.android.tools.r8.ir.conversion.IRBuilder.getBlockStartOffset(int):2546:2549 -> h
+    12:15:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2533 -> h
+    16:17:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2534:2535 -> h
+    18:19:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):322:323 -> h
+    18:19:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2535 -> h
     20:21:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(java.util.Collection):87:88 -> h
-    20:21:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):321 -> h
-    20:21:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2515 -> h
-    22:27:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):321:326 -> h
-    22:27:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2515 -> h
-    28:29:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.replaceNormalPredecessor(int,int):290:291 -> h
-    28:29:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):327 -> h
-    28:29:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2515 -> h
-    30:31:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):329:330 -> h
-    30:31:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2515 -> h
+    20:21:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):323 -> h
+    20:21:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2535 -> h
+    22:27:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):323:328 -> h
+    22:27:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2535 -> h
+    28:29:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.replaceNormalPredecessor(int,int):292:293 -> h
+    28:29:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):329 -> h
+    28:29:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2535 -> h
+    30:31:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):331:332 -> h
+    30:31:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2535 -> h
     32:33:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(java.util.Collection):87:88 -> h
-    32:33:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):330 -> h
-    32:33:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2515 -> h
-    34:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):330:334 -> h
-    34:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2515 -> h
-    39:39:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):295:295 -> h
-    39:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):335 -> h
-    39:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2515 -> h
-    40:40:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):337:337 -> h
-    40:40:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2515 -> h
+    32:33:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):332 -> h
+    32:33:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2535 -> h
+    34:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):332:336 -> h
+    34:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2535 -> h
+    39:39:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):297:297 -> h
+    39:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):337 -> h
+    39:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2535 -> h
+    40:40:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):339:339 -> h
+    40:40:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2535 -> h
     41:42:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):76:77 -> h
-    41:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):337 -> h
-    41:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2515 -> h
-    43:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):337:337 -> h
-    43:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2515 -> h
-    44:47:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2517:2520 -> h
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges():494:494 -> i
-    2:2:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2013:2013 -> i
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> i
-    3:3:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2014 -> i
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> i
-    4:4:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2015 -> i
-    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> i
-    5:5:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2016 -> i
-    6:7:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2017:2018 -> i
-    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> i
-    8:8:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2019 -> i
-    9:9:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2603:2603 -> i
-    1:1:com.android.tools.r8.ir.code.Value getReceiverValue():511:511 -> j
-    2:2:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2023:2023 -> j
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> j
-    3:3:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2024 -> j
-    4:4:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2025:2025 -> j
-    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> j
-    5:5:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2026 -> j
-    6:7:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2027:2028 -> j
-    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> j
-    8:8:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2029 -> j
-    9:10:boolean isIndexProcessed(int):2546:2547 -> j
-    11:12:void com.android.tools.r8.ir.conversion.IRBuilder.ensureSubroutineProcessedInstructions():2564:2565 -> j
-    11:12:boolean isIndexProcessed(int):2549 -> j
-    13:13:boolean isIndexProcessed(int):2550:2550 -> j
-    1:1:boolean isDebugMode():498:498 -> k
-    2:2:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1393:1393 -> k
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> k
-    3:3:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1394 -> k
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> k
-    4:4:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1395 -> k
-    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> k
-    5:5:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1396 -> k
-    6:7:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1398:1399 -> k
-    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> k
-    8:8:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1400 -> k
-    1:2:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1404:1405 -> l
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> l
-    3:3:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1406 -> l
-    4:4:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1407:1407 -> l
-    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> l
-    5:5:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1408 -> l
-    6:7:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1410:1411 -> l
-    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> l
-    8:8:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1412 -> l
-    1:1:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1902:1902 -> m
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> m
-    2:2:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1903 -> m
-    3:3:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1904:1904 -> m
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> m
-    4:4:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1905 -> m
-    5:6:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1908:1909 -> m
-    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> m
-    7:7:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1910 -> m
-    1:1:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2033:2033 -> n
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> n
-    2:2:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2034 -> n
-    3:3:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2035:2035 -> n
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> n
-    4:4:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2036 -> n
-    5:6:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2037:2038 -> n
-    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> n
-    7:7:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2039 -> n
-    1:1:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2043:2043 -> o
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> o
-    2:2:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2044 -> o
-    3:3:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2045:2045 -> o
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> o
-    4:4:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2046 -> o
-    5:6:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2047:2048 -> o
-    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> o
-    7:7:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2049 -> o
-    1:1:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2053:2053 -> p
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> p
-    2:2:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2054 -> p
-    3:3:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2055:2055 -> p
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> p
-    4:4:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2056 -> p
-    5:6:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2057:2058 -> p
-    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> p
-    7:7:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2059 -> p
-    1:1:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2063:2063 -> q
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> q
-    2:2:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2064 -> q
-    3:3:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2065:2065 -> q
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> q
-    4:4:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2066 -> q
-    5:6:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2067:2068 -> q
-    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> q
-    7:7:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2069 -> q
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> r
-    1:1:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1893 -> r
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> r
-    2:2:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1894 -> r
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> r
-    3:3:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1895 -> r
-    4:5:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1896:1897 -> r
-    6:6:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> r
-    6:6:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1898 -> r
-    1:1:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2073:2073 -> s
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> s
-    2:2:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2074 -> s
-    3:3:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2075:2075 -> s
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> s
-    4:4:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2076 -> s
-    5:6:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2077:2078 -> s
-    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> s
-    7:7:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2079 -> s
-    1:1:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2083:2083 -> t
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> t
-    2:2:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2084 -> t
-    3:3:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2085:2085 -> t
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> t
-    4:4:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2086 -> t
-    5:6:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2087:2088 -> t
-    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> t
-    7:7:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2089 -> t
-    1:7:java.lang.String toString():2787:2793 -> toString
-    1:1:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2093:2093 -> u
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> u
-    2:2:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2094 -> u
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> u
-    3:3:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2095 -> u
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> u
-    4:4:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2096 -> u
-    5:12:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2098:2105 -> u
-    13:13:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> u
-    13:13:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2106 -> u
-    1:1:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2110:2110 -> v
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2312:2312 -> v
-    2:2:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2111 -> v
-    3:3:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2113:2113 -> v
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> v
-    4:4:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2114 -> v
-    5:7:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2115:2117 -> v
-    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2367:2367 -> v
-    8:8:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2118 -> v
-    9:11:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2119:2121 -> v
-    12:12:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2441:2441 -> v
-    12:12:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2122 -> v
-com.android.tools.r8.ir.conversion.IRBuilder$1 -> com.android.tools.r8.internal.KR0:
-com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.internal.LR0:
+    41:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):339 -> h
+    41:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2535 -> h
+    43:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):339:339 -> h
+    43:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2535 -> h
+    44:47:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2537:2540 -> h
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges():496:496 -> i
+    2:2:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2029:2029 -> i
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> i
+    3:3:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2030 -> i
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> i
+    4:4:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2031 -> i
+    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> i
+    5:5:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2032 -> i
+    6:7:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2033:2034 -> i
+    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> i
+    8:8:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2035 -> i
+    9:9:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2623:2623 -> i
+    1:1:com.android.tools.r8.ir.code.Value getReceiverValue():513:513 -> j
+    2:2:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2039:2039 -> j
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> j
+    3:3:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2040 -> j
+    4:4:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2041:2041 -> j
+    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> j
+    5:5:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2042 -> j
+    6:7:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2043:2044 -> j
+    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> j
+    8:8:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2045 -> j
+    9:10:boolean isIndexProcessed(int):2566:2567 -> j
+    11:12:void com.android.tools.r8.ir.conversion.IRBuilder.ensureSubroutineProcessedInstructions():2584:2585 -> j
+    11:12:boolean isIndexProcessed(int):2569 -> j
+    13:13:boolean isIndexProcessed(int):2570:2570 -> j
+    1:1:boolean isDebugMode():500:500 -> k
+    2:2:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1409:1409 -> k
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> k
+    3:3:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1410 -> k
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> k
+    4:4:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1411 -> k
+    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> k
+    5:5:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1412 -> k
+    6:7:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1414:1415 -> k
+    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> k
+    8:8:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1416 -> k
+    1:2:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1420:1421 -> l
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> l
+    3:3:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1422 -> l
+    4:4:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1423:1423 -> l
+    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> l
+    5:5:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1424 -> l
+    6:7:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1426:1427 -> l
+    8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> l
+    8:8:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1428 -> l
+    1:1:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1918:1918 -> m
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> m
+    2:2:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1919 -> m
+    3:3:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1920:1920 -> m
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> m
+    4:4:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1921 -> m
+    5:6:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1924:1925 -> m
+    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> m
+    7:7:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1926 -> m
+    1:1:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2049:2049 -> n
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> n
+    2:2:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2050 -> n
+    3:3:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2051:2051 -> n
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> n
+    4:4:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2052 -> n
+    5:6:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2053:2054 -> n
+    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> n
+    7:7:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2055 -> n
+    1:1:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2059:2059 -> o
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> o
+    2:2:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2060 -> o
+    3:3:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2061:2061 -> o
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> o
+    4:4:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2062 -> o
+    5:6:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2063:2064 -> o
+    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> o
+    7:7:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2065 -> o
+    1:1:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2069:2069 -> p
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> p
+    2:2:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2070 -> p
+    3:3:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2071:2071 -> p
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> p
+    4:4:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2072 -> p
+    5:6:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2073:2074 -> p
+    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> p
+    7:7:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2075 -> p
+    1:1:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2079:2079 -> q
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> q
+    2:2:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2080 -> q
+    3:3:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2081:2081 -> q
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> q
+    4:4:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2082 -> q
+    5:6:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2083:2084 -> q
+    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> q
+    7:7:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2085 -> q
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> r
+    1:1:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1909 -> r
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> r
+    2:2:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1910 -> r
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> r
+    3:3:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1911 -> r
+    4:5:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1912:1913 -> r
+    6:6:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> r
+    6:6:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1914 -> r
+    1:1:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2089:2089 -> s
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> s
+    2:2:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2090 -> s
+    3:3:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2091:2091 -> s
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> s
+    4:4:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2092 -> s
+    5:6:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2093:2094 -> s
+    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> s
+    7:7:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2095 -> s
+    1:1:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2099:2099 -> t
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> t
+    2:2:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2100 -> t
+    3:3:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2101:2101 -> t
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> t
+    4:4:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2102 -> t
+    5:6:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2103:2104 -> t
+    7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> t
+    7:7:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2105 -> t
+    1:7:java.lang.String toString():2807:2813 -> toString
+    1:1:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2109:2109 -> u
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> u
+    2:2:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2110 -> u
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> u
+    3:3:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2111 -> u
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> u
+    4:4:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2112 -> u
+    5:12:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2114:2121 -> u
+    13:13:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> u
+    13:13:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2122 -> u
+    1:1:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2126:2126 -> v
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2328:2328 -> v
+    2:2:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2127 -> v
+    3:3:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2129:2129 -> v
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> v
+    4:4:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2130 -> v
+    5:7:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2131:2133 -> v
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2387:2387 -> v
+    8:8:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2134 -> v
+    9:11:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2135:2137 -> v
+    12:12:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2461:2461 -> v
+    12:12:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2138 -> v
+com.android.tools.r8.ir.conversion.IRBuilder$1 -> com.android.tools.r8.internal.NR0:
+com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.internal.OR0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet exceptionalPredecessors -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet exceptionalSuccessors -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet normalPredecessors -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet normalSuccessors -> c
     com.android.tools.r8.ir.code.BasicBlock block -> a
-    1:7:void <init>():273:279 -> <init>
-    1:25:java.lang.String toString():343:367 -> toString
-com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.internal.MR0:
+    1:7:void <init>():275:281 -> <init>
+    1:25:java.lang.String toString():345:369 -> toString
+com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.internal.PR0:
     com.android.tools.r8.graph.DexType guard -> d
     int targetOffset -> f
     int sourceOffset -> e
-    1:1:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,int,int,com.android.tools.r8.ir.conversion.IRBuilder$1):197:197 -> <init>
-    2:5:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,int,int):205:208 -> <init>
-    1:1:int access$600(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):197:197 -> a
-    1:1:com.android.tools.r8.graph.DexType access$700(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):197:197 -> b
-    1:1:int access$800(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):197:197 -> c
-com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.internal.NR0:
+    1:1:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,int,int,com.android.tools.r8.ir.conversion.IRBuilder$1):199:199 -> <init>
+    2:5:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,int,int):207:210 -> <init>
+    1:1:int access$600(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):199:199 -> a
+    1:1:com.android.tools.r8.graph.DexType access$700(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):199:199 -> b
+    1:1:int access$800(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):199:199 -> c
+com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.internal.QR0:
     int sourceOffset -> d
     int targetOffset -> e
     com.android.tools.r8.ir.code.Position position -> f
-    1:4:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Position,int,int):224:227 -> <init>
-    1:1:int access$200(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):212:212 -> a
-    1:1:int access$300(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):212:212 -> b
-    1:1:com.android.tools.r8.ir.code.Position access$500(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):212:212 -> c
-com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.internal.OR0:
+    1:4:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Position,int,int):226:229 -> <init>
+    1:1:int access$200(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):214:214 -> a
+    1:1:int access$300(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):214:214 -> b
+    1:1:com.android.tools.r8.ir.code.Position access$500(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):214:214 -> c
+com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.internal.RR0:
     java.util.List values -> a
-    1:3:void <init>():235:237 -> <init>
-    1:3:com.android.tools.r8.ir.conversion.IRBuilder$ValueList fromPhis(java.util.List,int):243:245 -> a
-    1:9:boolean equals(java.lang.Object):257:265 -> equals
-    1:1:int hashCode():252:252 -> hashCode
-com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.internal.PR0:
+    1:3:void <init>():237:239 -> <init>
+    1:3:com.android.tools.r8.ir.conversion.IRBuilder$ValueList fromPhis(java.util.List,int):245:247 -> a
+    1:9:boolean equals(java.lang.Object):259:267 -> equals
+    1:1:int hashCode():254:254 -> hashCode
+com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.internal.SR0:
     int firstInstructionIndex -> b
     boolean $assertionsDisabled -> c
     com.android.tools.r8.ir.code.BasicBlock block -> a
-    1:1:void <clinit>():185:185 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.conversion.IRBuilder$1):185:185 -> <init>
-    2:5:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):190:193 -> <init>
-    1:1:com.android.tools.r8.ir.code.BasicBlock access$100(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):185:185 -> a
-    1:1:int access$400(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):185:185 -> b
+    1:1:void <clinit>():187:187 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.conversion.IRBuilder$1):187:187 -> <init>
+    2:5:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):192:195 -> <init>
+    1:1:com.android.tools.r8.ir.code.BasicBlock access$100(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):187:187 -> a
+    1:1:int access$400(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):187:187 -> b
 com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.ir.conversion.r:
     com.android.tools.r8.utils.CfgPrinter printer -> n
     boolean $assertionsDisabled -> N
@@ -79050,310 +79127,322 @@ com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.ir.conver
     java.util.concurrent.atomic.AtomicBoolean seenNeverMergePrefix -> M
     com.android.tools.r8.ir.optimize.Devirtualizer devirtualizer -> u
     1:1:void <clinit>():124:124 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):183:183 -> <init>
-    2:153:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):166:317 -> <init>
-    boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$29(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):182:182 -> <init>
+    2:148:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):165:311 -> <init>
+    boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$34(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
     1:2:void com.android.tools.r8.ir.desugar.lambda.LambdaDeserializationMethodRemover.run(com.android.tools.r8.graph.AppView):17:18 -> a
-    1:2:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):371 -> a
-    3:3:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):373:373 -> a
-    4:25:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):372:393 -> a
-    26:26:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
-    26:26:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):393 -> a
-    27:27:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):394:394 -> a
-    28:29:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):364:365 -> a
-    28:29:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):396 -> a
-    30:36:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):398:404 -> a
-    37:37:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):401:401 -> a
-    38:38:java.lang.String lambda$new$0(java.lang.String):202:202 -> a
+    1:2:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):358 -> a
+    3:3:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):360:360 -> a
+    4:25:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):359:380 -> a
+    26:26:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
+    26:26:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):380 -> a
+    27:27:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):381:381 -> a
+    28:29:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):351:352 -> a
+    28:29:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):383 -> a
+    30:36:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):385:391 -> a
+    37:37:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):388:388 -> a
+    38:38:java.lang.String lambda$new$0(java.lang.String):201:201 -> a
     39:39:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getPackageBinaryNameFromJavaType(java.lang.String):380:380 -> a
-    39:39:java.lang.String lambda$new$0(java.lang.String):202 -> a
-    40:40:java.lang.String lambda$new$0(java.lang.String):202:202 -> a
-    41:41:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$1(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring):334:334 -> a
-    42:46:com.android.tools.r8.graph.DexApplication commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):409:413 -> a
-    47:51:com.android.tools.r8.graph.DexApplication commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):410:414 -> a
-    52:56:void commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):420:424 -> a
-    57:57:void commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):421:421 -> a
-    58:60:void classSynthesisDesugaring(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):432:432 -> a
-    62:62:void classSynthesisDesugaring(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):434:434 -> a
-    63:63:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):455:455 -> a
+    39:39:java.lang.String lambda$new$0(java.lang.String):201 -> a
+    40:40:java.lang.String lambda$new$0(java.lang.String):201:201 -> a
+    41:41:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$1(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring):328:328 -> a
+    42:46:com.android.tools.r8.graph.DexApplication commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):396:400 -> a
+    47:51:com.android.tools.r8.graph.DexApplication commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):397:401 -> a
+    52:56:void commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):407:411 -> a
+    57:57:void commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):408:408 -> a
+    58:60:void classSynthesisDesugaring(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):419:419 -> a
+    62:62:void classSynthesisDesugaring(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):421:421 -> a
+    63:63:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):442:442 -> a
     64:66:com.android.tools.r8.ir.conversion.ClassConverter com.android.tools.r8.ir.conversion.ClassConverter.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor):38:40 -> a
-    64:66:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):456 -> a
-    67:77:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):456:466 -> a
+    64:66:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):443 -> a
+    67:77:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):443:453 -> a
     78:86:void com.android.tools.r8.ir.desugar.lambda.D8LambdaDesugaring.rewriteEnclosingLambdaMethodAttributes(com.android.tools.r8.graph.AppView,java.util.Map):17:25 -> a
-    78:86:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):465 -> a
-    87:87:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):468:468 -> a
-    88:90:void prepareDesugaringForD8(java.util.concurrent.ExecutorService):474:476 -> a
-    91:99:void prepareDesugaringForD8(java.util.concurrent.ExecutorService):475:483 -> a
-    100:100:void lambda$prepareDesugaringForD8$5(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.DexProgramClass):478:478 -> a
-    101:101:void lambda$prepareDesugaringForD8$4(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):480:480 -> a
-    102:132:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor):490:520 -> a
-    133:133:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor):519:519 -> a
-    134:137:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):529:532 -> a
-    138:144:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):531:537 -> a
-    145:150:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1128:1133 -> a
-    145:150:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):537 -> a
-    151:155:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):569:573 -> a
-    151:155:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):540 -> a
+    78:86:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):452 -> a
+    87:87:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):455:455 -> a
+    88:90:void prepareDesugaringForD8(java.util.concurrent.ExecutorService):461:463 -> a
+    91:99:void prepareDesugaringForD8(java.util.concurrent.ExecutorService):462:470 -> a
+    100:100:void lambda$prepareDesugaringForD8$5(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.DexProgramClass):465:465 -> a
+    101:101:void lambda$prepareDesugaringForD8$4(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):467:467 -> a
+    102:132:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor):477:507 -> a
+    133:133:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor):506:506 -> a
+    134:137:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):516:519 -> a
+    138:144:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):518:524 -> a
+    145:150:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1134:1139 -> a
+    145:150:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):524 -> a
+    151:155:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):556:560 -> a
+    151:155:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):527 -> a
     156:156:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
-    156:156:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):573 -> a
-    156:156:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):540 -> a
-    157:177:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):574:594 -> a
-    157:177:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):540 -> a
+    156:156:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):560 -> a
+    156:156:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):527 -> a
+    157:177:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):561:581 -> a
+    157:177:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):527 -> a
     178:178:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    178:178:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):594 -> a
-    178:178:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):540 -> a
+    178:178:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):581 -> a
+    178:178:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):527 -> a
     179:179:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     179:179:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    179:179:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):594 -> a
-    179:179:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):540 -> a
-    180:180:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):594:594 -> a
-    180:180:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):540 -> a
-    181:181:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):541:541 -> a
-    182:182:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    182:182:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):541 -> a
-    183:193:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):541:551 -> a
-    194:203:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):544:553 -> a
-    204:204:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    204:204:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):553 -> a
-    205:205:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):554:554 -> a
-    206:210:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1724:1728 -> a
-    206:210:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):554 -> a
-    211:216:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):601:606 -> a
-    217:217:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):605:605 -> a
-    218:219:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexProgramClass):608:609 -> a
-    220:222:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):611:613 -> a
-    223:223:void lambda$optimize$8(java.util.concurrent.ExecutorService,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):644:644 -> a
-    224:226:void lambda$optimize$9(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator):647:649 -> a
-    227:227:com.android.tools.r8.utils.Timing lambda$optimize$10(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):674:674 -> a
-    228:228:void lambda$optimize$11(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):703:703 -> a
-    229:229:void lambda$optimize$12(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator):716:716 -> a
-    230:230:void com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder.put(com.android.tools.r8.ir.conversion.PostOptimization):72:72 -> a
-    230:230:void lambda$optimize$12(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator):716 -> a
-    231:231:void lambda$optimize$13(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.PostMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):737:737 -> a
-    232:233:void lambda$optimize$14(com.android.tools.r8.ir.code.IRCode):791:792 -> a
-    234:247:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet):857:870 -> a
-    248:254:void addWaveDoneAction(com.android.tools.r8.utils.Action):874:880 -> a
-    255:255:void addWaveDoneAction(com.android.tools.r8.utils.Action):878:878 -> a
-    256:256:void addWaveDoneAction(com.android.tools.r8.utils.Action):875:875 -> a
-    257:258:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):889:890 -> a
-    259:259:void lambda$computeReachabilitySensitivity$17(com.android.tools.r8.graph.DexEncodedMethod):894:894 -> a
-    260:261:void forEachSelectedOutliningMethod(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.function.Consumer,java.util.concurrent.ExecutorService):904:905 -> a
-    262:264:void lambda$forEachSelectedOutliningMethod$19(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):908:910 -> a
-    265:265:boolean com.android.tools.r8.graph.Code.isOutlineCode():0:0 -> a
-    265:265:void lambda$forEachSelectedOutliningMethod$19(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):910 -> a
-    266:274:void lambda$forEachSelectedOutliningMethod$19(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):910:918 -> a
-    275:278:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.ProgramMethod):931:934 -> a
-    279:279:void clearDexMethodCompilationState():938:938 -> a
-    280:280:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):942:942 -> a
-    281:290:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):955:964 -> a
-    291:296:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):963:968 -> a
-    297:297:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1015:1015 -> a
-    297:297:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):968 -> a
-    298:298:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):968:968 -> a
-    299:299:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):967:967 -> a
-    300:301:void optimizeSynthesizedMethods(java.util.List,java.util.concurrent.ExecutorService):976:977 -> a
-    302:302:void lambda$optimizeSynthesizedMethod$20(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):997:997 -> a
-    303:305:void processMethodsConcurrently(com.android.tools.r8.utils.collections.SortedProgramMethodSet,java.util.concurrent.ExecutorService):1004:1006 -> a
-    306:306:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1015:1015 -> a
-    307:309:com.android.tools.r8.utils.Timing processDesugaredMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1024:1026 -> a
-    310:315:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1128:1133 -> a
-    310:315:com.android.tools.r8.utils.Timing processDesugaredMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1026 -> a
-    316:316:com.android.tools.r8.utils.Timing rewriteDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1069:1069 -> a
-    316:316:com.android.tools.r8.utils.Timing processDesugaredMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1028 -> a
-    317:317:com.android.tools.r8.utils.Timing rewriteDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1067:1067 -> a
-    317:317:com.android.tools.r8.utils.Timing processDesugaredMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1028 -> a
-    318:320:com.android.tools.r8.utils.Timing processDesugaredMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1031:1033 -> a
-    321:330:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1081:1090 -> a
-    321:330:com.android.tools.r8.utils.Timing lambda$rewriteCode$22(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1054 -> a
-    331:331:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1086:1086 -> a
-    331:331:com.android.tools.r8.utils.Timing lambda$rewriteCode$22(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1054 -> a
-    332:337:boolean desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1122:1127 -> a
-    332:337:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1092 -> a
-    332:337:com.android.tools.r8.utils.Timing lambda$rewriteCode$22(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1054 -> a
-    338:341:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1095:1098 -> a
-    338:341:com.android.tools.r8.utils.Timing lambda$rewriteCode$22(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1054 -> a
-    342:349:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1094:1101 -> a
-    342:349:com.android.tools.r8.utils.Timing lambda$rewriteCode$22(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1054 -> a
-    350:356:boolean needsIRConversion():559:565 -> a
-    350:356:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1104 -> a
-    350:356:com.android.tools.r8.utils.Timing lambda$rewriteCode$22(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1054 -> a
-    357:367:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1104:1114 -> a
-    357:367:com.android.tools.r8.utils.Timing lambda$rewriteCode$22(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1054 -> a
-    368:369:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1105:1106 -> a
-    368:369:com.android.tools.r8.utils.Timing lambda$rewriteCode$22(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1054 -> a
-    370:380:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1139:1149 -> a
-    381:386:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1937:1942 -> a
-    381:386:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1152 -> a
-    387:393:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1153:1159 -> a
-    394:394:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1997:1997 -> a
-    394:394:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1159 -> a
-    395:420:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1160:1185 -> a
-    421:453:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1183:1215 -> a
-    454:477:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1212:1235 -> a
-    478:478:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.ir.code.IRCode):93:93 -> a
-    478:478:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1235 -> a
-    479:516:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1236:1273 -> a
-    517:517:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):875:875 -> a
-    517:517:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1273 -> a
-    518:518:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):869:869 -> a
-    518:518:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1273 -> a
-    519:622:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1274:1377 -> a
-    623:624:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.shouldRun(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):83:84 -> a
-    623:624:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1377 -> a
-    625:630:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1378:1383 -> a
-    631:633:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1037:1039 -> a
-    631:633:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1384 -> a
-    634:646:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1388:1400 -> a
-    647:678:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1399:1430 -> a
-    679:732:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1419:1472 -> a
-    733:733:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    733:733:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1472 -> a
-    734:756:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1473:1495 -> a
-    757:762:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1138:1143 -> a
-    757:762:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1495 -> a
-    763:808:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1495:1540 -> a
-    809:809:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():2005:2005 -> a
-    809:809:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1540 -> a
-    810:818:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1541:1549 -> a
-    819:819:void lambda$optimize$23(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1262:1262 -> a
-    820:820:void lambda$optimize$24(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1266:1266 -> a
-    821:823:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$25(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1432:1432 -> a
-    824:881:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,com.android.tools.r8.utils.Timing):1563:1620 -> a
-    882:882:void lambda$collectOptimizationInfo$26(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1564:1564 -> a
-    883:887:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1632:1636 -> a
-    888:889:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1644:1645 -> a
-    890:890:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    890:890:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1645 -> a
-    891:896:void finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions):1662:1667 -> a
-    891:896:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1646 -> a
-    897:897:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1648:1648 -> a
-    898:909:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1675:1686 -> a
-    898:909:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1649 -> a
-    910:914:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1724:1728 -> a
-    910:914:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1686 -> a
-    910:914:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1649 -> a
-    915:917:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1687:1689 -> a
-    915:917:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1649 -> a
-    918:918:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1015:1015 -> a
-    918:918:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1689 -> a
-    918:918:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1649 -> a
-    919:919:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1689:1689 -> a
-    919:919:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1649 -> a
-    920:926:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1688:1694 -> a
-    920:926:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1649 -> a
-    927:927:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1654:1654 -> a
-    928:928:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    928:928:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1654 -> a
-    929:930:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1654:1655 -> a
-    931:931:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    931:931:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):1032 -> a
-    931:931:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1655 -> a
-    932:932:com.android.tools.r8.graph.CfCode com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCfCode():1038:1038 -> a
-    932:932:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):1033 -> a
-    932:932:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1655 -> a
-    933:933:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):1034:1034 -> a
-    933:933:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1655 -> a
-    934:935:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1656:1657 -> a
-    936:936:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1699:1699 -> a
-    937:946:boolean shouldComputeInliningConstraint(com.android.tools.r8.graph.ProgramMethod):1708:1717 -> a
-    937:946:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1701 -> a
-    947:949:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1702:1704 -> a
-    950:957:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1740:1747 -> a
-    958:958:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():2030:2030 -> a
-    958:958:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1747 -> a
-    959:959:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1748:1748 -> a
-    960:972:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3913:3925 -> a
-    960:972:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1748 -> a
-    973:973:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1594:1594 -> a
-    973:973:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3926 -> a
-    973:973:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1748 -> a
-    974:975:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3926:3927 -> a
-    974:975:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1748 -> a
-    976:991:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1750:1765 -> a
-    992:992:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1764:1764 -> a
-    993:994:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$28(com.android.tools.r8.graph.DexItemFactory):1830:1831 -> a
-    995:995:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$28(com.android.tools.r8.graph.DexItemFactory):1829:1829 -> a
-    996:996:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1877:1877 -> a
-    997:997:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1953:1953 -> a
-    998:998:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
-    998:998:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1954 -> a
-    999:1016:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1955:1972 -> a
-    1:1:void clearNestAttributes():345:345 -> b
-    2:8:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):440:446 -> b
-    9:12:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):445:448 -> b
-    13:16:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):447:450 -> b
-    17:17:boolean lambda$prepareDesugaringForD8$3(com.android.tools.r8.graph.DexEncodedMethod):479:479 -> b
-    18:18:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):625:625 -> b
+    179:179:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):581 -> a
+    179:179:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):527 -> a
+    180:180:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):581:581 -> a
+    180:180:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):527 -> a
+    181:181:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):528:528 -> a
+    182:182:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    182:182:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):528 -> a
+    183:193:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):528:538 -> a
+    194:203:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):531:540 -> a
+    204:204:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    204:204:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):540 -> a
+    205:205:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):541:541 -> a
+    206:210:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1735:1739 -> a
+    206:210:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):541 -> a
+    211:216:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):588:593 -> a
+    217:217:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):592:592 -> a
+    218:219:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexProgramClass):595:596 -> a
+    220:222:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):598:600 -> a
+    223:223:void lambda$optimize$8(java.util.concurrent.ExecutorService,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):632:632 -> a
+    224:226:void lambda$optimize$9(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator):635:637 -> a
+    227:227:void lambda$optimize$10(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.optimize.enums.EnumUnboxer):643:643 -> a
+    228:228:void lambda$optimize$11(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer):647:647 -> a
+    229:229:void lambda$optimize$12(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.optimize.Inliner):650:650 -> a
+    230:230:com.android.tools.r8.utils.Timing lambda$optimize$13(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):673:673 -> a
+    231:231:void lambda$optimize$14(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):707:707 -> a
+    232:232:void lambda$optimize$15(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator):711:711 -> a
+    233:233:void lambda$optimize$16(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.ir.optimize.Inliner):719:719 -> a
+    234:234:void lambda$optimize$18(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.PostMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):748:748 -> a
+    235:236:void lambda$optimize$19(com.android.tools.r8.ir.code.IRCode):802:803 -> a
+    237:250:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet):868:881 -> a
+    251:257:void addWaveDoneAction(com.android.tools.r8.utils.Action):885:891 -> a
+    258:258:void addWaveDoneAction(com.android.tools.r8.utils.Action):889:889 -> a
+    259:259:void addWaveDoneAction(com.android.tools.r8.utils.Action):886:886 -> a
+    260:261:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):900:901 -> a
+    262:262:void lambda$computeReachabilitySensitivity$22(com.android.tools.r8.graph.DexEncodedMethod):905:905 -> a
+    263:264:void forEachSelectedOutliningMethod(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.function.Consumer,java.util.concurrent.ExecutorService):915:916 -> a
+    265:267:void lambda$forEachSelectedOutliningMethod$24(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):919:921 -> a
+    268:268:boolean com.android.tools.r8.graph.Code.isOutlineCode():0:0 -> a
+    268:268:void lambda$forEachSelectedOutliningMethod$24(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):921 -> a
+    269:277:void lambda$forEachSelectedOutliningMethod$24(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):921:929 -> a
+    278:281:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.ProgramMethod):942:945 -> a
+    282:282:void clearDexMethodCompilationState():949:949 -> a
+    283:283:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):953:953 -> a
+    284:293:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):966:975 -> a
+    294:299:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):974:979 -> a
+    300:300:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1026:1026 -> a
+    300:300:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):979 -> a
+    301:301:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):979:979 -> a
+    302:302:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):978:978 -> a
+    303:304:void optimizeSynthesizedMethods(java.util.List,java.util.concurrent.ExecutorService):987:988 -> a
+    305:305:void lambda$optimizeSynthesizedMethod$25(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1008:1008 -> a
+    306:308:void processMethodsConcurrently(com.android.tools.r8.utils.collections.SortedProgramMethodSet,java.util.concurrent.ExecutorService):1015:1017 -> a
+    309:309:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1026:1026 -> a
+    310:312:com.android.tools.r8.utils.Timing processDesugaredMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1035:1037 -> a
+    313:318:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1134:1139 -> a
+    313:318:com.android.tools.r8.utils.Timing processDesugaredMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1037 -> a
+    319:319:com.android.tools.r8.utils.Timing rewriteDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1080:1080 -> a
+    319:319:com.android.tools.r8.utils.Timing processDesugaredMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1039 -> a
+    320:320:com.android.tools.r8.utils.Timing rewriteDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1078:1078 -> a
+    320:320:com.android.tools.r8.utils.Timing processDesugaredMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1039 -> a
+    321:323:com.android.tools.r8.utils.Timing processDesugaredMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1042:1044 -> a
+    324:333:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1092:1101 -> a
+    324:333:com.android.tools.r8.utils.Timing lambda$rewriteCode$27(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1065 -> a
+    334:334:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1097:1097 -> a
+    334:334:com.android.tools.r8.utils.Timing lambda$rewriteCode$27(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1065 -> a
+    335:340:boolean desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1133:1138 -> a
+    335:340:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1103 -> a
+    335:340:com.android.tools.r8.utils.Timing lambda$rewriteCode$27(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1065 -> a
+    341:344:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1106:1109 -> a
+    341:344:com.android.tools.r8.utils.Timing lambda$rewriteCode$27(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1065 -> a
+    345:352:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1105:1112 -> a
+    345:352:com.android.tools.r8.utils.Timing lambda$rewriteCode$27(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1065 -> a
+    353:359:boolean needsIRConversion():546:552 -> a
+    353:359:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1115 -> a
+    353:359:com.android.tools.r8.utils.Timing lambda$rewriteCode$27(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1065 -> a
+    360:370:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1115:1125 -> a
+    360:370:com.android.tools.r8.utils.Timing lambda$rewriteCode$27(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1065 -> a
+    371:372:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1116:1117 -> a
+    371:372:com.android.tools.r8.utils.Timing lambda$rewriteCode$27(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1065 -> a
+    373:383:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1150:1160 -> a
+    384:389:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1948:1953 -> a
+    384:389:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1163 -> a
+    390:396:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1164:1170 -> a
+    397:397:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1997:1997 -> a
+    397:397:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1170 -> a
+    398:423:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1171:1196 -> a
+    424:456:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1194:1226 -> a
+    457:480:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1223:1246 -> a
+    481:481:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.ir.code.IRCode):93:93 -> a
+    481:481:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1246 -> a
+    482:519:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1247:1284 -> a
+    520:520:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):887:887 -> a
+    520:520:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1284 -> a
+    521:521:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):881:881 -> a
+    521:521:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1284 -> a
+    522:625:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1285:1388 -> a
+    626:627:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.shouldRun(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):83:84 -> a
+    626:627:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1388 -> a
+    628:633:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1389:1394 -> a
+    634:636:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1048:1050 -> a
+    634:636:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1395 -> a
+    637:649:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1399:1411 -> a
+    650:681:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1410:1441 -> a
+    682:735:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1430:1483 -> a
+    736:736:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    736:736:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1483 -> a
+    737:759:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1484:1506 -> a
+    760:765:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1144:1149 -> a
+    760:765:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1506 -> a
+    766:811:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1506:1551 -> a
+    812:812:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():2005:2005 -> a
+    812:812:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1551 -> a
+    813:821:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1552:1560 -> a
+    822:822:void lambda$optimize$28(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1273:1273 -> a
+    823:823:void lambda$optimize$29(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1277:1277 -> a
+    824:826:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$30(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1443:1443 -> a
+    827:884:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,com.android.tools.r8.utils.Timing):1574:1631 -> a
+    885:885:void lambda$collectOptimizationInfo$31(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1575:1575 -> a
+    886:890:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1643:1647 -> a
+    891:892:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1655:1656 -> a
+    893:893:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    893:893:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1656 -> a
+    894:899:void finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions):1673:1678 -> a
+    894:899:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1657 -> a
+    900:900:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1659:1659 -> a
+    901:912:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1686:1697 -> a
+    901:912:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1660 -> a
+    913:917:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1735:1739 -> a
+    913:917:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1697 -> a
+    913:917:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1660 -> a
+    918:920:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1698:1700 -> a
+    918:920:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1660 -> a
+    921:921:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1026:1026 -> a
+    921:921:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1700 -> a
+    921:921:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1660 -> a
+    922:922:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1700:1700 -> a
+    922:922:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1660 -> a
+    923:929:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1699:1705 -> a
+    923:929:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1660 -> a
+    930:930:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1665:1665 -> a
+    931:931:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    931:931:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1665 -> a
+    932:933:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1665:1666 -> a
+    934:934:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    934:934:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):974 -> a
+    934:934:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1666 -> a
+    935:935:com.android.tools.r8.graph.CfCode com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCfCode():980:980 -> a
+    935:935:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):975 -> a
+    935:935:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1666 -> a
+    936:936:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):976:976 -> a
+    936:936:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1666 -> a
+    937:938:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1667:1668 -> a
+    939:939:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1710:1710 -> a
+    940:949:boolean shouldComputeInliningConstraint(com.android.tools.r8.graph.ProgramMethod):1719:1728 -> a
+    940:949:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1712 -> a
+    950:952:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1713:1715 -> a
+    953:960:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1751:1758 -> a
+    961:961:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():2030:2030 -> a
+    961:961:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1758 -> a
+    962:962:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1759:1759 -> a
+    963:975:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3913:3925 -> a
+    963:975:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1759 -> a
+    976:976:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
+    976:976:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3926 -> a
+    976:976:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1759 -> a
+    977:978:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3926:3927 -> a
+    977:978:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1759 -> a
+    979:994:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1761:1776 -> a
+    995:995:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.utils.Timing):1775:1775 -> a
+    996:997:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$33(com.android.tools.r8.graph.DexItemFactory):1841:1842 -> a
+    998:998:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$33(com.android.tools.r8.graph.DexItemFactory):1840:1840 -> a
+    999:999:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1888:1888 -> a
+    1000:1000:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1964:1964 -> a
+    1001:1001:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
+    1001:1001:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1965 -> a
+    1002:1019:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1966:1983 -> a
+    1:1:void clearNestAttributes():339:339 -> b
+    2:8:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):427:433 -> b
+    9:12:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):432:435 -> b
+    13:16:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):434:437 -> b
+    17:17:boolean lambda$prepareDesugaringForD8$3(com.android.tools.r8.graph.DexEncodedMethod):466:466 -> b
+    18:18:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):612:612 -> b
     19:19:boolean com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection.isEmpty():0:0 -> b
-    19:19:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):625 -> b
-    20:24:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):625:629 -> b
-    25:26:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):358:359 -> b
-    25:26:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):630 -> b
-    27:62:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):631:666 -> b
-    63:115:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):665:717 -> b
-    116:116:void com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder.put(com.android.tools.r8.ir.conversion.PostOptimization):72:72 -> b
-    116:116:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):718 -> b
-    117:122:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):720:725 -> b
-    123:123:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumDataMap.empty():20:20 -> b
-    123:123:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):727 -> b
-    124:153:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):727:756 -> b
-    154:154:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> b
-    154:154:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):756 -> b
-    155:155:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):757:757 -> b
-    156:157:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.GraphLens):352:353 -> b
-    156:157:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):759 -> b
-    158:174:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):760:776 -> b
-    175:237:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):775:837 -> b
-    238:241:boolean checkLegacySyntheticsAreInBuilder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication$Builder):845:848 -> b
-    238:241:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):838 -> b
-    242:242:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):839:839 -> b
-    243:246:void lambda$optimize$15(com.android.tools.r8.ir.code.IRCode):800:803 -> b
-    247:247:void lambda$optimize$15(com.android.tools.r8.ir.code.IRCode):802:802 -> b
-    248:248:void lambda$optimize$16(com.android.tools.r8.graph.ProgramMethod):808:808 -> b
-    249:249:void waveStart(com.android.tools.r8.utils.collections.ProgramMethodSet):853:853 -> b
-    250:252:void lambda$computeReachabilitySensitivity$18(com.android.tools.r8.graph.DexProgramClass):892:894 -> b
-    253:253:void processSynthesizedServiceLoaderMethods(java.util.List,java.util.concurrent.ExecutorService):926:926 -> b
-    254:254:void lambda$processMethodsConcurrently$21(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1008:1008 -> b
-    255:256:com.android.tools.r8.utils.Timing rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1051:1052 -> b
-    257:257:com.android.tools.r8.utils.Timing rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1050:1050 -> b
-    258:262:boolean lambda$workaroundForwardingInitializerBug$27(com.android.tools.r8.ir.code.Instruction):1793:1797 -> b
-    263:264:void printPhase(java.lang.String):1947:1948 -> b
+    19:19:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):612 -> b
+    20:48:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):612:640 -> b
+    49:49:void com.android.tools.r8.utils.ConsumerUtils.acceptIfNotNull(java.lang.Object,java.util.function.Consumer):24:24 -> b
+    49:49:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):640 -> b
+    50:50:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):644:644 -> b
+    51:51:void com.android.tools.r8.utils.ConsumerUtils.acceptIfNotNull(java.lang.Object,java.util.function.Consumer):24:24 -> b
+    51:51:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):644 -> b
+    52:52:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):648:648 -> b
+    53:53:void com.android.tools.r8.utils.ConsumerUtils.acceptIfNotNull(java.lang.Object,java.util.function.Consumer):24:24 -> b
+    53:53:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):648 -> b
+    54:66:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):652:664 -> b
+    67:122:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):663:718 -> b
+    123:123:void com.android.tools.r8.utils.ConsumerUtils.acceptIfNotNull(java.lang.Object,java.util.function.Consumer):24:24 -> b
+    123:123:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):718 -> b
+    124:130:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):721:727 -> b
+    131:131:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumDataMap.empty():20:20 -> b
+    131:131:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):729 -> b
+    132:137:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):729:734 -> b
+    138:138:void com.android.tools.r8.utils.ConsumerUtils.acceptIfNotNull(java.lang.Object,java.util.function.Consumer):24:24 -> b
+    138:138:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):734 -> b
+    139:166:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):740:767 -> b
+    167:167:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> b
+    167:167:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):767 -> b
+    168:168:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):768:768 -> b
+    169:170:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):345:346 -> b
+    169:170:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):770 -> b
+    171:187:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):771:787 -> b
+    188:250:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):786:848 -> b
+    251:254:boolean checkLegacySyntheticsAreInBuilder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication$Builder):856:859 -> b
+    251:254:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):849 -> b
+    255:255:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):850:850 -> b
+    256:256:void lambda$optimize$17(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer):737:737 -> b
+    257:260:void lambda$optimize$20(com.android.tools.r8.ir.code.IRCode):811:814 -> b
+    261:261:void lambda$optimize$20(com.android.tools.r8.ir.code.IRCode):813:813 -> b
+    262:262:void lambda$optimize$21(com.android.tools.r8.graph.ProgramMethod):819:819 -> b
+    263:263:void waveStart(com.android.tools.r8.utils.collections.ProgramMethodSet):864:864 -> b
+    264:266:void lambda$computeReachabilitySensitivity$23(com.android.tools.r8.graph.DexProgramClass):903:905 -> b
+    267:267:void processSynthesizedServiceLoaderMethods(java.util.List,java.util.concurrent.ExecutorService):937:937 -> b
+    268:268:void lambda$processMethodsConcurrently$26(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1019:1019 -> b
+    269:270:com.android.tools.r8.utils.Timing rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1062:1063 -> b
+    271:271:com.android.tools.r8.utils.Timing rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1061:1061 -> b
+    272:276:boolean lambda$workaroundForwardingInitializerBug$32(com.android.tools.r8.ir.code.Instruction):1804:1808 -> b
+    277:278:void printPhase(java.lang.String):1958:1959 -> b
     boolean lambda$postProcessingDesugaringForD8$2(com.android.tools.r8.graph.ProgramMethod) -> c
-    1:5:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):332:336 -> c
-    6:6:boolean isInWave():884:884 -> c
-    7:7:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1822:1822 -> c
+    1:5:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):326:330 -> c
+    6:6:boolean isInWave():895:895 -> c
+    7:7:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1833:1833 -> c
     8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1981:1981 -> c
-    8:8:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1822 -> c
-    9:20:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1825:1836 -> c
+    8:8:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1833 -> c
+    9:20:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1836:1847 -> c
     21:21:boolean com.android.tools.r8.ir.code.Instruction.isMul():0:0 -> c
-    21:21:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1882 -> c
-    21:21:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1837 -> c
-    22:23:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1883:1884 -> c
-    22:23:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1837 -> c
-    24:24:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1840:1840 -> c
-    25:25:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1889:1889 -> c
-    25:25:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1841 -> c
+    21:21:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1893 -> c
+    21:21:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1848 -> c
+    22:23:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1894:1895 -> c
+    22:23:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1848 -> c
+    24:24:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1851:1851 -> c
+    25:25:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1900:1900 -> c
+    25:25:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1852 -> c
     26:26:boolean com.android.tools.r8.ir.code.Instruction.isSub():0:0 -> c
-    26:26:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1889 -> c
-    26:26:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1841 -> c
-    27:27:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1890:1890 -> c
-    27:27:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1841 -> c
-    28:29:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1894:1895 -> c
-    28:29:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1844 -> c
-    30:31:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1847:1848 -> c
-    32:36:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1868:1872 -> c
-    32:36:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1849 -> c
-    37:42:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1850:1855 -> c
-    43:54: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):1904:1915 -> c
-    43:54:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1856 -> c
-    1:1:void reportNestDesugarDependencies():340:340 -> d
-    2:6:void optimizeSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod):991:995 -> d
-    7:7:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1771:1771 -> d
+    26:26:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1900 -> c
+    26:26:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1852 -> c
+    27:27:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1901:1901 -> c
+    27:27:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1852 -> c
+    28:29:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1905:1906 -> c
+    28:29:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1855 -> c
+    30:31:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1858:1859 -> c
+    32:36:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1879:1883 -> c
+    32:36:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1860 -> c
+    37:42:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1861:1866 -> c
+    43:54: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):1915:1926 -> c
+    43:54:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1867 -> c
+    1:1:void reportNestDesugarDependencies():334:334 -> d
+    2:6:void optimizeSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod):1002:1006 -> d
+    7:7:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1782:1782 -> d
     8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():2018:2018 -> d
-    8:8:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1771 -> d
-    9:25:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1775:1791 -> d
-    26:38:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1921:1933 -> d
-    26:38:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1802 -> d
+    8:8:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1782 -> d
+    9:25:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1786:1802 -> d
+    26:38:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1932:1944 -> d
+    26:38:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1813 -> d
 com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.ir.conversion.t:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer enumUnboxer -> b
@@ -79411,7 +79500,7 @@ com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.ir.c
     1148:1169:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):241:262 -> a
     1170:1190:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):257:277 -> a
     1191:1208:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):272:289 -> a
-    1209:1210:com.android.tools.r8.ir.code.ConstInstruction com.android.tools.r8.graph.RewrittenPrototypeDescription.getConstantReturn(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position):432:433 -> a
+    1209:1210:com.android.tools.r8.ir.code.ConstInstruction com.android.tools.r8.graph.RewrittenPrototypeDescription.getConstantReturn(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position):505:506 -> a
     1209:1210:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):289 -> a
     1211:1219:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):290:298 -> a
     1220:1264:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):297:341 -> a
@@ -79452,22 +79541,25 @@ com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.ir.c
     2362:2362:java.util.Map lambda$rewrite$2(com.android.tools.r8.ir.analysis.value.SingleNumberValue):318:318 -> a
     2363:2369:com.android.tools.r8.ir.code.Value lambda$rewrite$3(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):322:328 -> a
     2370:2370:com.android.tools.r8.ir.code.Value lambda$rewrite$3(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):327:327 -> a
-    2371:2378:com.android.tools.r8.ir.code.Value lambda$rewrite$3(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):324:331 -> a
-    2379:2383:com.android.tools.r8.ir.code.Value lambda$rewrite$3(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):330:334 -> a
-    2384:2384:com.android.tools.r8.ir.code.Instruction lambda$rewrite$4(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):528:528 -> a
-    2385:2385:com.android.tools.r8.ir.code.Instruction lambda$rewrite$6(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):546:546 -> a
-    2386:2386:com.android.tools.r8.ir.code.Instruction lambda$rewrite$7(com.android.tools.r8.ir.code.InvokeMultiNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):556:556 -> a
-    2387:2387:com.android.tools.r8.ir.code.Instruction lambda$rewrite$8(com.android.tools.r8.ir.code.InvokeNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):566:566 -> a
-    2388:2388:com.android.tools.r8.ir.code.Instruction lambda$rewrite$10(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):584:584 -> a
-    2389:2396:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):688:695 -> a
-    2397:2402:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):694:699 -> a
-    2403:2403:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):710:710 -> a
-    2404:2414:boolean defaultValueHasChanged(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):723:733 -> a
-    2404:2414:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):710 -> a
-    2415:2417:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):711:713 -> a
-    2418:2421:com.android.tools.r8.ir.analysis.type.TypeElement defaultValueLatticeElement(com.android.tools.r8.graph.DexType):738:741 -> a
-    2418:2421:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):715 -> a
-    2422:2424:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):714:716 -> a
+    2371:2371:com.android.tools.r8.ir.code.Value lambda$rewrite$3(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):324:324 -> a
+    2372:2372:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
+    2372:2372:com.android.tools.r8.ir.code.Value lambda$rewrite$3(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):324 -> a
+    2373:2375:com.android.tools.r8.ir.code.Value lambda$rewrite$3(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):329:331 -> a
+    2376:2380:com.android.tools.r8.ir.code.Value lambda$rewrite$3(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):330:334 -> a
+    2381:2381:com.android.tools.r8.ir.code.Instruction lambda$rewrite$4(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):528:528 -> a
+    2382:2382:com.android.tools.r8.ir.code.Instruction lambda$rewrite$6(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):546:546 -> a
+    2383:2383:com.android.tools.r8.ir.code.Instruction lambda$rewrite$7(com.android.tools.r8.ir.code.InvokeMultiNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):556:556 -> a
+    2384:2384:com.android.tools.r8.ir.code.Instruction lambda$rewrite$8(com.android.tools.r8.ir.code.InvokeNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):566:566 -> a
+    2385:2385:com.android.tools.r8.ir.code.Instruction lambda$rewrite$10(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):584:584 -> a
+    2386:2393:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):688:695 -> a
+    2394:2399:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):694:699 -> a
+    2400:2400:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):710:710 -> a
+    2401:2411:boolean defaultValueHasChanged(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):723:733 -> a
+    2401:2411:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):710 -> a
+    2412:2414:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):711:713 -> a
+    2415:2418:com.android.tools.r8.ir.analysis.type.TypeElement defaultValueLatticeElement(com.android.tools.r8.graph.DexType):738:741 -> a
+    2415:2418:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):715 -> a
+    2419:2421:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):714:716 -> a
     1:1:com.android.tools.r8.ir.code.Instruction lambda$rewrite$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):537:537 -> b
     1:1:com.android.tools.r8.ir.code.Instruction lambda$rewrite$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):575:575 -> c
 com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.ir.conversion.s:
@@ -79493,7 +79585,7 @@ com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.a
     18:18:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):850 -> a
     19:21:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):850:852 -> a
     22:22:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):848:848 -> a
-com.android.tools.r8.ir.conversion.LensCodeRewriterUtils -> com.android.tools.r8.internal.w41:
+com.android.tools.r8.ir.conversion.LensCodeRewriterUtils -> com.android.tools.r8.internal.z41:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map protoFixupCache -> d
     boolean $assertionsDisabled -> f
@@ -79553,34 +79645,34 @@ com.android.tools.r8.ir.conversion.LibraryDesugaredChecker -> com.android.tools.
     1:3:void <init>(com.android.tools.r8.graph.AppView):25:27 -> <init>
     1:4:boolean isClassLibraryDesugared(com.android.tools.r8.graph.DexProgramClass):31:34 -> a
 com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer -> com.android.tools.r8.ir.conversion.u:
-    com.android.tools.r8.graph.DexString jDollarDescriptorPrefix -> c
-    com.android.tools.r8.graph.AppView appView -> d
-    boolean isLibraryDesugared -> f
-    com.android.tools.r8.graph.DexProgramClass clazz -> e
+    com.android.tools.r8.graph.DexString jDollarDescriptorPrefix -> d
+    com.android.tools.r8.graph.AppView appView -> e
+    com.android.tools.r8.graph.DexProgramClass clazz -> f
+    boolean isLibraryDesugared -> g
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProgramClass):46:46 -> <init>
     2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProgramClass):42:49 -> <init>
-    1:1:boolean isLibraryDesugared():57:57 -> a
-    2:2:void registerClass(com.android.tools.r8.graph.DexProgramClass):61:61 -> a
-    3:3:void registerTypeReference(com.android.tools.r8.graph.DexType):175:175 -> a
-    3:3:void registerClass(com.android.tools.r8.graph.DexProgramClass):62 -> a
-    4:4:void registerClass(com.android.tools.r8.graph.DexProgramClass):64:64 -> a
-    5:5:void registerTypeReference(com.android.tools.r8.graph.DexType):175:175 -> a
-    5:5:void registerClass(com.android.tools.r8.graph.DexProgramClass):65 -> a
-    6:10:void registerClass(com.android.tools.r8.graph.DexProgramClass):67:71 -> a
-    11:20:void registerMethod(com.android.tools.r8.graph.ProgramMethod):101:110 -> a
-    11:20:void registerClass(com.android.tools.r8.graph.DexProgramClass):71 -> a
-    21:25:void registerClass(com.android.tools.r8.graph.DexProgramClass):72:76 -> a
-    26:26:void registerField(com.android.tools.r8.graph.DexEncodedField):97:97 -> a
-    27:27:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):125:125 -> a
-    28:28:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod,boolean):140:140 -> a
-    29:29:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):150:150 -> a
-    1:1:void run():53:53 -> b
-    2:2:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):135:135 -> b
-    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):115:115 -> c
-    2:2:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):130:130 -> c
-    3:3:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):155:155 -> c
-    1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):145:145 -> d
-    2:2:void registerInstanceOf(com.android.tools.r8.graph.DexType):180:180 -> d
+    1:1:void registerClass(com.android.tools.r8.graph.DexProgramClass):61:61 -> a
+    2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):175:175 -> a
+    2:2:void registerClass(com.android.tools.r8.graph.DexProgramClass):62 -> a
+    3:3:void registerClass(com.android.tools.r8.graph.DexProgramClass):64:64 -> a
+    4:4:void registerTypeReference(com.android.tools.r8.graph.DexType):175:175 -> a
+    4:4:void registerClass(com.android.tools.r8.graph.DexProgramClass):65 -> a
+    5:9:void registerClass(com.android.tools.r8.graph.DexProgramClass):67:71 -> a
+    10:19:void registerMethod(com.android.tools.r8.graph.ProgramMethod):101:110 -> a
+    10:19:void registerClass(com.android.tools.r8.graph.DexProgramClass):71 -> a
+    20:24:void registerClass(com.android.tools.r8.graph.DexProgramClass):72:76 -> a
+    25:25:void registerField(com.android.tools.r8.graph.DexEncodedField):97:97 -> a
+    26:26:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):125:125 -> a
+    27:27:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod,boolean):140:140 -> a
+    28:28:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):150:150 -> a
+    1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):135:135 -> b
+    1:1:boolean isLibraryDesugared():57:57 -> c
+    2:2:void registerInitClass(com.android.tools.r8.graph.DexType):115:115 -> c
+    3:3:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):130:130 -> c
+    4:4:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):155:155 -> c
+    1:1:void run():53:53 -> d
+    2:2:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):145:145 -> d
+    3:3:void registerInstanceOf(com.android.tools.r8.graph.DexType):180:180 -> d
     1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):120:120 -> e
     2:2:void registerNewInstance(com.android.tools.r8.graph.DexType):160:160 -> e
     3:3:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):165:165 -> e
@@ -79602,16 +79694,16 @@ com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTra
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> i
     2:2:void registerField(com.android.tools.r8.graph.DexField):86 -> i
     3:3:void registerField(com.android.tools.r8.graph.DexField):86:86 -> i
-com.android.tools.r8.ir.conversion.MethodConversionOptions -> com.android.tools.r8.internal.x71:
+com.android.tools.r8.ir.conversion.MethodConversionOptions -> com.android.tools.r8.internal.A71:
     1:1:void <init>():7:7 -> <init>
     boolean isPeepholeOptimizationsEnabled() -> a
-com.android.tools.r8.ir.conversion.MethodConversionOptions$DefaultMethodConversionOptions -> com.android.tools.r8.internal.v71:
+com.android.tools.r8.ir.conversion.MethodConversionOptions$DefaultMethodConversionOptions -> com.android.tools.r8.internal.y71:
     com.android.tools.r8.ir.conversion.MethodConversionOptions$DefaultMethodConversionOptions INSTANCE -> a
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>():37:37 -> <init>
     boolean isPeepholeOptimizationsEnabled() -> a
     1:1:com.android.tools.r8.ir.conversion.MethodConversionOptions$DefaultMethodConversionOptions getInstance():40:40 -> b
-com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions -> com.android.tools.r8.internal.w71:
+com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions -> com.android.tools.r8.internal.z71:
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> a
     boolean enablePeepholeOptimizations -> b
     boolean $assertionsDisabled -> c
@@ -79620,7 +79712,7 @@ com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversi
     2:5:void <init>(com.android.tools.r8.ir.conversion.MethodProcessor):14:17 -> <init>
     1:2:boolean isPeepholeOptimizationsEnabled():27:28 -> a
     1:2:void disablePeepholeOptimizations():21:22 -> b
-com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.internal.M71:
+com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.internal.P71:
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext createMethodProcessingContext(com.android.tools.r8.graph.ProgramMethod) -> a
     com.android.tools.r8.ir.conversion.CallSiteInformation getCallSiteInformation() -> a
@@ -79668,7 +79760,7 @@ com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder -> com.android
     2:6:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):88:92 -> <init>
     1:1:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder add(com.android.tools.r8.graph.ProgramMethod):96:96 -> a
     2:2:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor build():101:101 -> a
-com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$MethodAction -> com.android.tools.r8.internal.nd1:
+com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$MethodAction -> com.android.tools.r8.internal.qd1:
     void accept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
 com.android.tools.r8.ir.conversion.PartialCallGraphBuilder -> com.android.tools.r8.ir.conversion.z:
     com.android.tools.r8.utils.collections.ProgramMethodSet seeds -> f
@@ -79690,28 +79782,26 @@ com.android.tools.r8.ir.conversion.PostMethodProcessor -> com.android.tools.r8.i
     3:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):36:42 -> <init>
     1:1:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext createMethodProcessingContext(com.android.tools.r8.graph.ProgramMethod):47:47 -> a
     2:2:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext createMethodProcessingContext(com.android.tools.r8.graph.ProgramMethod):47:47 -> a
-    2:2:void lambda$forEachMethod$0(java.util.function.BiConsumer,com.android.tools.r8.graph.ProgramMethod):140 -> a
-    3:3:void lambda$forEachMethod$0(java.util.function.BiConsumer,com.android.tools.r8.graph.ProgramMethod):140:140 -> a
-    4:4:java.util.Deque createWaves(com.android.tools.r8.ir.conversion.CallGraph):115:115 -> a
+    2:2:void lambda$forEachMethod$0(java.util.function.BiConsumer,com.android.tools.r8.graph.ProgramMethod):142 -> a
+    3:3:void lambda$forEachMethod$0(java.util.function.BiConsumer,com.android.tools.r8.graph.ProgramMethod):142:142 -> a
+    4:4:java.util.Deque createWaves(com.android.tools.r8.ir.conversion.CallGraph):117:117 -> a
     5:5:boolean com.android.tools.r8.ir.conversion.CallGraph.isEmpty():276:276 -> a
-    5:5:java.util.Deque createWaves(com.android.tools.r8.ir.conversion.CallGraph):117 -> a
-    6:9:java.util.Deque createWaves(com.android.tools.r8.ir.conversion.CallGraph):118:121 -> a
-    10:23:void forEachMethod(java.util.function.BiConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,java.util.concurrent.ExecutorService):132:145 -> a
+    5:5:java.util.Deque createWaves(com.android.tools.r8.ir.conversion.CallGraph):119 -> a
+    6:9:java.util.Deque createWaves(com.android.tools.r8.ir.conversion.CallGraph):120:123 -> a
+    10:23:void forEachMethod(java.util.function.BiConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,java.util.concurrent.ExecutorService):134:147 -> a
     1:2:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):52:53 -> d
 com.android.tools.r8.ir.conversion.PostMethodProcessor$1 -> com.android.tools.r8.ir.conversion.A:
 com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder -> com.android.tools.r8.ir.conversion.B:
     com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder methodsToReprocessBuilder -> a
-    1:1:void <init>():61:61 -> <init>
-    2:2:void <init>():59:59 -> <init>
-    1:1:void add(com.android.tools.r8.graph.ProgramMethod):64:64 -> a
-    2:2:void put(com.android.tools.r8.utils.collections.ProgramMethodSet):68:68 -> a
-    3:3:void removePrunedMethods(java.lang.Iterable):76:76 -> a
-    4:4:void rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):83:83 -> a
-    5:26:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):89:110 -> a
-    27:27:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):94:94 -> a
-    28:28:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    28:28:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):94 -> a
-    29:32:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):94:97 -> a
+    1:3:void <init>(com.android.tools.r8.graph.GraphLens):60:62 -> <init>
+    1:1:void add(com.android.tools.r8.graph.ProgramMethod):67:67 -> a
+    2:2:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder getMethodsToReprocessBuilder():71:71 -> a
+    3:3:void put(com.android.tools.r8.utils.collections.ProgramMethodSet):75:75 -> a
+    4:24:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):92:112 -> a
+    25:25:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):97:97 -> a
+    26:26:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
+    26:26:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):97 -> a
+    27:30:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):97:100 -> a
 com.android.tools.r8.ir.conversion.PrimaryMethodProcessor -> com.android.tools.r8.ir.conversion.E:
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> g
     com.android.tools.r8.graph.AppView appView -> c
@@ -79738,11 +79828,11 @@ com.android.tools.r8.ir.conversion.PrimaryMethodProcessor -> com.android.tools.r
     37:59:void forEachMethod(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction,java.util.function.Consumer,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):133:155 -> a
     boolean isPrimaryMethodProcessor() -> b
     1:2:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):78:79 -> d
-com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction -> com.android.tools.r8.internal.gf1:
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction -> com.android.tools.r8.internal.jf1:
     com.android.tools.r8.utils.Timing apply(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
 com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction -> com.android.tools.r8.ir.conversion.D:
     void notifyWaveStart(com.android.tools.r8.utils.collections.ProgramMethodSet) -> a
-com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.internal.Gn1:
+com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.internal.yn1:
     void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean) -> a
     void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean) -> a
     void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder) -> a
@@ -79766,11 +79856,11 @@ com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.internal.G
     int instructionOffset(int) -> e
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
-com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.internal.kp1:
+com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.internal.cp1:
     1:7:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.isDefinedByStringHashCode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):187:193 -> a
     1:7:boolean access$700(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):107 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.internal.cp1:
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.internal.ep1:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.internal.Uo1:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.internal.Wo1:
     com.android.tools.r8.ir.code.Phi idValue -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap mapping -> c
     com.android.tools.r8.ir.code.BasicBlock fallthroughBlock -> a
@@ -79781,7 +79871,7 @@ com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> co
     2:2:com.android.tools.r8.ir.code.BasicBlock access$002(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):647:647 -> a
     1:1:com.android.tools.r8.ir.code.Phi access$100(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping):647:647 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap access$300(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping):647:647 -> c
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.internal.dp1:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.internal.Vo1:
     1:1:void <init>():649:649 -> <init>
     1:1:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping build(com.android.tools.r8.ir.code.BasicBlock):676:676 -> a
     2:2:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):688:688 -> a
@@ -79801,7 +79891,7 @@ com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Build
     63:77:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.BasicBlock):766:780 -> a
     78:78:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder.setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):682:682 -> a
     78:78:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.BasicBlock):769 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.internal.gp1:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.internal.Yo1:
     java.util.Map mapping -> c
     com.android.tools.r8.ir.code.Value value -> d
     com.android.tools.r8.ir.code.BasicBlock insertionBlock -> b
@@ -79811,7 +79901,7 @@ com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo
     30:30:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,java.util.Set):330:330 -> a
     30:30:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):326 -> a
     30:30:void createAndInsertStringSwitch(com.android.tools.r8.ir.code.IRCode):304 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.internal.fp1:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.internal.Xo1:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:1:void <clinit>():198:198 -> <clinit>
@@ -79827,7 +79917,7 @@ com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo
     20:20:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping.builder(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):643:643 -> a
     20:20:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):221 -> a
     21:45:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):223:247 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.internal.ip1:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.internal.ap1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap mapping -> c
     com.android.tools.r8.ir.code.Value stringHashValue -> b
     com.android.tools.r8.ir.code.BasicBlock insertionBlock -> a
@@ -79838,7 +79928,7 @@ com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> co
     3:7:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):631:635 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$200(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping):308:308 -> a
     1:1:com.android.tools.r8.ir.code.Value access$500(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping):308:308 -> b
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.internal.hp1:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.internal.Zo1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.ir.code.Phi intermediateIdValue -> c
     com.android.tools.r8.ir.code.Value stringValue -> d
@@ -79890,10 +79980,10 @@ com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Build
     150:150: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):605 -> a
     151:164: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):607:620 -> 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):404:430 -> b
-    28:30:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():1541:1543 -> b
+    28:30:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():1545:1547 -> 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):430 -> 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):431:431 -> b
-com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.internal.jp1:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.internal.bp1:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():797:797 -> <clinit>
     1:2:com.android.tools.r8.ir.code.BasicBlock getTrueTarget(com.android.tools.r8.ir.code.If):800:801 -> a
@@ -79993,7 +80083,7 @@ com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleStringSwitchRemover
     1:1:void <init>(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.StringSwitch,java.util.Set,com.android.tools.r8.ir.conversion.StringSwitchRemover$1):153:153 -> <init>
     2:7:void <init>(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):166:171 -> <init>
     void removeStringSwitch() -> a
-com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.internal.Tp1:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.internal.Lp1:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
     boolean $assertionsDisabled -> c
@@ -80004,13 +80094,13 @@ com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8
     22:22:int[] absoluteTargets(int):68:68 -> a
     23:23:void clear():84:84 -> a
     1:1:int[] getKeys(int):72:72 -> b
-com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.internal.Sp1:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.internal.Kp1:
     int[] absoluteTargets -> b
     int[] keys -> c
     int userOffset -> a
     1:1:void <init>(int):26:26 -> <init>
     2:7:void <init>(int):22:27 -> <init>
-com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.internal.zr1:
+com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.internal.rr1:
     java.util.Map unificationParents -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.IRBuilder builder -> b
@@ -80085,105 +80175,104 @@ com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r
     165:177:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):216:228 -> a
     178:187:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):226:235 -> a
     188:190:com.android.tools.r8.ir.code.Value canonical(com.android.tools.r8.ir.code.Value):273:275 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter -> com.android.tools.r8.internal.QA0:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter -> com.android.tools.r8.internal.TA0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods rewritableMethods -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():53:53 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView):58:61 -> <init>
     1:8:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):77:84 -> a
-    9:9:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):91:91 -> a
-    10:26:java.util.List generateListOfBackportedMethods(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):100:116 -> a
-    27:27:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):123:123 -> a
-    28:80:void com.android.tools.r8.ir.desugar.backports.BackportedMethods.registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):58:110 -> a
-    28:80:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):123 -> a
-    81:90:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):128:137 -> a
-    91:91:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
-    91:91:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):137 -> a
-    92:106:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):137:151 -> a
+    9:10:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):91:92 -> a
+    11:27:java.util.List generateListOfBackportedMethods(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):97:113 -> a
+    28:28:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):120:120 -> a
+    29:81:void com.android.tools.r8.ir.desugar.backports.BackportedMethods.registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):58:110 -> a
+    29:81:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):120 -> a
+    82:91:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):125:134 -> a
+    92:92:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
+    92:92:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):134 -> a
+    93:107:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):134:148 -> a
     1:1:boolean hasBackports():65:65 -> b
-    2:2:boolean methodIsBackport(com.android.tools.r8.graph.DexMethod):95:95 -> b
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$FullMethodInvokeRewriter -> com.android.tools.r8.internal.IA0:
-    1:1:void <init>():1522:1522 -> <init>
-    1:1:com.android.tools.r8.cf.code.CfInstruction rewriteSingle(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):1526:1526 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.internal.JA0:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$FullMethodInvokeRewriter -> com.android.tools.r8.internal.LA0:
+    1:1:void <init>():1519:1519 -> <init>
+    1:1:com.android.tools.r8.cf.code.CfInstruction rewriteSingle(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):1523:1523 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.internal.MA0:
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriter -> b
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter):1421:1422 -> <init>
-    1:1:java.util.Collection rewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator):1432:1432 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.internal.KA0:
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter):1418:1419 -> <init>
+    1:1:java.util.Collection rewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator):1429:1429 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.internal.NA0:
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory factory -> b
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory):1442:1442 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1446:1447 -> <init>
-    1:3:java.util.Collection rewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator):1458:1460 -> a
-    4:7:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1466:1469 -> a
-    8:8:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1467:1467 -> a
-    9:11:void lambda$getSyntheticMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1473:1475 -> a
-    12:12:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1475:1475 -> a
-    13:13:com.android.tools.r8.graph.Code com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator.generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1483:1483 -> a
-    13:13:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1475 -> a
-    14:14:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1479:1479 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.internal.LA0:
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory):1439:1439 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1443:1444 -> <init>
+    1:3:java.util.Collection rewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator):1455:1457 -> a
+    4:7:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1463:1466 -> a
+    8:8:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1464:1464 -> a
+    9:11:void lambda$getSyntheticMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1470:1472 -> a
+    12:12:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1472:1472 -> a
+    13:13:com.android.tools.r8.graph.Code com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator.generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1480:1480 -> a
+    13:13:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1472 -> a
+    14:14:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1476:1476 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.internal.OA0:
     com.android.tools.r8.cf.code.CfInstruction rewriteSingle(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory) -> a
-    1:1:java.util.Collection rewrite(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.LocalStackAllocator):1518:1518 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.internal.MA0:
+    1:1:java.util.Collection rewrite(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.LocalStackAllocator):1515:1515 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.internal.PA0:
     com.android.tools.r8.graph.DexMethod method -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod):1404:1405 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod):1401:1402 -> <init>
     java.util.Collection rewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator) -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.internal.NA0:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.internal.QA0:
     java.util.Map rewritable -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():156:156 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):163:163 -> <init>
-    2:53:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):161:212 -> <init>
-    1:1:boolean isEmpty():216:216 -> a
-    2:2:void visit(java.util.function.Consumer):220:220 -> a
-    3:133:void initializeAndroidKMethodProviders(com.android.tools.r8.graph.DexItemFactory):225:355 -> a
-    134:134:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$0(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):925:925 -> a
-    135:156:void addProvider(com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):1371:1392 -> a
-    157:157:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getProvider(com.android.tools.r8.graph.DexMethod):1396:1396 -> a
-    1:338:void initializeAndroidNMethodProviders(com.android.tools.r8.graph.DexItemFactory):361:698 -> b
-    339:339:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$1(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):946:946 -> b
+    1:1:void <clinit>():153:153 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):160:160 -> <init>
+    2:53:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):158:209 -> <init>
+    1:1:boolean isEmpty():213:213 -> a
+    2:2:void visit(java.util.function.Consumer):217:217 -> a
+    3:133:void initializeAndroidKMethodProviders(com.android.tools.r8.graph.DexItemFactory):222:352 -> a
+    134:134:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$0(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):922:922 -> a
+    135:156:void addProvider(com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):1368:1389 -> a
+    157:157:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getProvider(com.android.tools.r8.graph.DexMethod):1393:1393 -> a
+    1:338:void initializeAndroidNMethodProviders(com.android.tools.r8.graph.DexItemFactory):358:695 -> b
+    339:339:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$1(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):943:943 -> b
     1:6:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):74:79 -> c
-    1:6:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):966 -> c
+    1:6:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):963 -> c
     7:40:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):77:110 -> c
-    7:40:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):966 -> c
+    7:40:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):963 -> c
     41:41:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):105:105 -> c
-    41:41:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):966 -> c
+    41:41:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):963 -> c
     42:60:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):102:120 -> c
-    42:60:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):966 -> c
-    61:219:void initializeAndroidOMethodProviders(com.android.tools.r8.graph.DexItemFactory):705:863 -> c
-    1:48:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):875:922 -> d
-    49:73:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):919:943 -> d
-    74:97:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):940:963 -> d
-    98:116:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):960:978 -> d
-    1:99:void initializeAndroidSMethodProviders(com.android.tools.r8.graph.DexItemFactory):988:1086 -> e
-    100:100:void initializeAndroidSMethodProviders(com.android.tools.r8.graph.DexItemFactory):1084:1084 -> e
-    1:23:void initializeJava10OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1293:1315 -> f
-    1:61:void initializeJava11MethodProviders(com.android.tools.r8.graph.DexItemFactory):1159:1219 -> g
-    1:20:void initializeJava11OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1321:1340 -> h
-    1:13:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1091:1103 -> i
+    42:60:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):963 -> c
+    61:219:void initializeAndroidOMethodProviders(com.android.tools.r8.graph.DexItemFactory):702:860 -> c
+    1:48:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):872:919 -> d
+    49:73:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):916:940 -> d
+    74:97:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):937:960 -> d
+    98:116:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):957:975 -> d
+    1:99:void initializeAndroidSMethodProviders(com.android.tools.r8.graph.DexItemFactory):985:1083 -> e
+    100:100:void initializeAndroidSMethodProviders(com.android.tools.r8.graph.DexItemFactory):1081:1081 -> e
+    1:23:void initializeJava10OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1290:1312 -> f
+    1:61:void initializeJava11MethodProviders(com.android.tools.r8.graph.DexItemFactory):1156:1216 -> g
+    1:20:void initializeJava11OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1318:1337 -> h
+    1:13:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1088:1100 -> i
     14:14:boolean com.android.tools.r8.utils.InternalOptions.canParseNumbersWithPlusPrefix():2186:2186 -> i
-    14:14:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1103 -> i
-    15:19:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1104:1108 -> i
-    20:44:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1102:1126 -> i
+    14:14:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1100 -> i
+    15:19:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1101:1105 -> i
+    20:44:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1099:1123 -> i
     45:45:boolean com.android.tools.r8.utils.InternalOptions.canParseNumbersWithPlusPrefix():2186:2186 -> i
-    45:45:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1126 -> i
-    46:50:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1127:1131 -> i
-    51:72:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1125:1146 -> i
-    1:61:void initializeJava9OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1226:1286 -> j
-    1:8:void initializeObjectsMethodProviders(com.android.tools.r8.graph.DexItemFactory):1359:1366 -> k
-    1:7:void initializeStreamMethodProviders(com.android.tools.r8.graph.DexItemFactory):1347:1353 -> l
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.internal.OA0:
+    45:45:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1123 -> i
+    46:50:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1124:1128 -> i
+    51:72:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1122:1143 -> i
+    1:61:void initializeJava9OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1223:1283 -> j
+    1:8:void initializeObjectsMethodProviders(com.android.tools.r8.graph.DexItemFactory):1356:1363 -> k
+    1:7:void initializeStreamMethodProviders(com.android.tools.r8.graph.DexItemFactory):1344:1350 -> l
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.internal.RA0:
     com.android.tools.r8.graph.DexType receiverType -> c
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String,com.android.tools.r8.graph.DexType):1496:1497 -> <init>
-    1:1:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1502:1502 -> a
-    2:2:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator.getProto(com.android.tools.r8.graph.DexItemFactory):1479:1479 -> a
-    2:2:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1502 -> a
-    3:3:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1502:1502 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.internal.PA0:
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String,com.android.tools.r8.graph.DexType):1493:1494 -> <init>
+    1:1:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1499:1499 -> a
+    2:2:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator.getProto(com.android.tools.r8.graph.DexItemFactory):1476:1476 -> a
+    2:2:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1499 -> a
+    3:3:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1499:1499 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.internal.SA0:
     com.android.tools.r8.graph.CfCode create(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod) -> a
-com.android.tools.r8.ir.desugar.BufferCovariantReturnTypeRewriter -> com.android.tools.r8.internal.AC0:
+com.android.tools.r8.ir.desugar.BufferCovariantReturnTypeRewriter -> com.android.tools.r8.internal.DC0:
     com.android.tools.r8.graph.DexItemFactory factory -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView):28:30 -> <init>
     1:15:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):42:56 -> a
@@ -80193,33 +80282,33 @@ com.android.tools.r8.ir.desugar.BufferCovariantReturnTypeRewriter -> com.android
     32:32:com.android.tools.r8.graph.DexMethod matchingBufferCovariantMethod(com.android.tools.r8.graph.DexMethod):74:74 -> a
     33:35:boolean isInvokeCandidate(com.android.tools.r8.cf.code.CfInstruction):82:84 -> a
     36:40:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):89:93 -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring -> com.android.tools.r8.internal.fD0:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring -> com.android.tools.r8.internal.iD0:
     void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer) -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection -> com.android.tools.r8.internal.iD0:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection -> com.android.tools.r8.internal.lD0:
     1:1:void <init>():18:18 -> <init>
     void synthesizeClasses(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer) -> a
     1:2:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):22:23 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
     3:3:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):23 -> a
     4:4:com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.create(com.android.tools.r8.graph.AppView):43:43 -> a
     4:4:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):25 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
     5:5:com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.create(com.android.tools.r8.graph.AppView):43 -> a
     5:5:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):25 -> a
     6:9:com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.create(com.android.tools.r8.graph.AppView):44:47 -> a
     6:9:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):25 -> a
     10:26:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):27:43 -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection$EmptyCfClassSynthesizerCollection -> com.android.tools.r8.internal.gD0:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection$EmptyCfClassSynthesizerCollection -> com.android.tools.r8.internal.jD0:
     1:1:void <init>():71:71 -> <init>
     void synthesizeClasses(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer) -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection$NonEmptyCfClassSynthesizerCollection -> com.android.tools.r8.internal.hD0:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection$NonEmptyCfClassSynthesizerCollection -> com.android.tools.r8.internal.kD0:
     java.util.Collection synthesizers -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():50:50 -> <clinit>
     1:3:void <init>(java.util.Collection):55:57 -> <init>
     1:1:void synthesizeClasses(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):64:64 -> a
     2:2:void lambda$synthesizeClasses$0(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring):66:66 -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer -> com.android.tools.r8.internal.jD0:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer -> com.android.tools.r8.internal.mD0:
     java.util.Set synthesizedClasses -> a
     1:7:void <init>():15:21 -> <init>
     1:1:void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass):40:40 -> a
@@ -80227,13 +80316,13 @@ com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer -> com
     1:1:void acceptDesugaredLibraryRetargeterDispatchProgramClass(com.android.tools.r8.graph.DexProgramClass):35:35 -> b
     1:1:void acceptProgramEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):25:25 -> c
     1:1:void acceptWrapperProgramClass(com.android.tools.r8.graph.DexProgramClass):30:30 -> d
-com.android.tools.r8.ir.desugar.CfInstructionDesugaring -> com.android.tools.r8.internal.TD0:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaring -> com.android.tools.r8.internal.WD0:
     java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory) -> a
     boolean hasPreciseNeedsDesugaring() -> a
     boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod) -> a
     void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions) -> a
     void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer) -> a
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection -> com.android.tools.r8.internal.UD0:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection -> com.android.tools.r8.internal.XD0:
     1:1:void <init>():26:26 -> <init>
     void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer) -> a
     com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getInterfaceMethodPostProcessingDesugaringD8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor) -> a
@@ -80244,12 +80333,12 @@ com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection -> com.android
     void withD8NestBasedAccessDesugaring(com.android.tools.r8.utils.ThrowingConsumer) -> a
     void withDesugaredLibraryAPIConverter(java.util.function.Consumer) -> a
     1:6:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView):29:34 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     7:7:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView):34 -> a
     8:10:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView):35:37 -> a
     11:11:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection empty():41:41 -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo getRetargetingInfo() -> b
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.YD0:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.bE0:
     1:1:void <init>():46:46 -> <init>
     void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer.acceptConstantDynamicClass(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod) -> a
     void com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer.acceptInvokeSpecialBridgeInfo(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo) -> a
@@ -80263,7 +80352,7 @@ com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer -> com.andr
     void com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer.acceptInvokeStaticInterfaceOutliningMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> d
     void com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer.acceptThrowMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> e
     void com.android.tools.r8.ir.desugar.twr.TwrCloseResourceDesugaringEventConsumer.acceptTwrCloseResourceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> f
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$1 -> com.android.tools.r8.internal.VD0:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$1 -> com.android.tools.r8.internal.YD0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():84:84 -> <clinit>
     1:1:void <init>():84:84 -> <init>
@@ -80285,7 +80374,7 @@ com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$1 -> com.an
     1:1:void acceptInvokeStaticInterfaceOutliningMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):120:120 -> d
     1:1:void acceptThrowMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):114:114 -> e
     1:1:void acceptTwrCloseResourceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):171:171 -> f
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.WD0:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.ZD0:
     java.util.Map pendingInvokeSpecialBridges -> b
     java.util.List synthesizedConstantDynamicClasses -> d
     java.util.List synthesizedLambdaClasses -> c
@@ -80329,7 +80418,7 @@ com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstruc
     1:1:void acceptInvokeStaticInterfaceOutliningMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):276:276 -> d
     1:1:void acceptThrowMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):270:270 -> e
     1:1:void acceptTwrCloseResourceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):265:265 -> f
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.XD0:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.aE0:
     java.util.function.BiConsumer onCompanionMethodCallback -> i
     com.android.tools.r8.graph.AppView appView -> a
     java.util.function.BiConsumer twrCloseResourceMethodConsumer -> d
@@ -80369,15 +80458,15 @@ com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstruc
     2:15:void finalizeLambdaDesugaring():513:526 -> d
     void acceptThrowMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> e
     1:1:void acceptTwrCloseResourceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):495:495 -> f
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaring -> com.android.tools.r8.internal.xE0:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaring -> com.android.tools.r8.internal.AE0:
     void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService) -> a
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.AE0:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.DE0:
     1:1:void <init>():21:21 -> <init>
     void postProcessingDesugaring(java.util.Collection,java.util.function.Predicate,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService) -> a
     1:1:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):27:27 -> a
     2:4:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):59:61 -> a
     2:4:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):28 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
     5:5:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):61 -> a
     5:5:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):28 -> a
     6:24:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):62:80 -> a
@@ -80389,59 +80478,63 @@ com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection -> com.andr
     26:26:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):28 -> a
     27:27:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection.empty():35:35 -> a
     27:27:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):31 -> a
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$EmptyCfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.yE0:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$EmptyCfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.BE0:
     com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$EmptyCfPostProcessingDesugaringCollection INSTANCE -> a
     1:1:void <clinit>():102:102 -> <clinit>
     1:1:void <init>():105:105 -> <init>
     void postProcessingDesugaring(java.util.Collection,java.util.function.Predicate,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService) -> a
     1:1:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$EmptyCfPostProcessingDesugaringCollection access$000():99:99 -> a
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.zE0:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.CE0:
     java.util.List desugarings -> a
     1:2:void <init>(java.util.List):51:52 -> <init>
     1:2:void postProcessingDesugaring(java.util.Collection,java.util.function.Predicate,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):93:94 -> a
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.EE0:
-    1:1:void <init>():23:23 -> <init>
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.HE0:
+    1:1:void <init>():26:26 -> <init>
     void com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer.acceptEmulatedInterfaceMarkerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClasspathClass) -> a
     void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer.acceptInterfaceInjection(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass) -> a
-    1:1:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$D8CfPostProcessingDesugaringEventConsumer createForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection):30:30 -> a
-    2:2:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$R8PostProcessingDesugaringEventConsumer createForR8(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection):35:35 -> a
+    void com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer.warnMissingInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper) -> a
+    1:1:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$D8CfPostProcessingDesugaringEventConsumer createForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection):33:33 -> a
+    2:2:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$R8PostProcessingDesugaringEventConsumer createForR8(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,java.util.function.BiConsumer):40:40 -> a
     void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPICallbackSynthesizorEventConsumer.acceptAPIConversionCallback(com.android.tools.r8.graph.ProgramMethod) -> b
     void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer.acceptForwardingMethod(com.android.tools.r8.graph.ProgramMethod) -> c
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$1 -> com.android.tools.r8.internal.BE0:
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$D8CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.CE0:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$1 -> com.android.tools.r8.internal.EE0:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$D8CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.FE0:
     com.android.tools.r8.utils.collections.ProgramMethodSet methodsToReprocess -> b
     com.android.tools.r8.ir.conversion.D8MethodProcessor methodProcessor -> a
     com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection instructionDesugaring -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():40:40 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$1):40:40 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection):51:51 -> <init>
-    3:10:void <init>(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection):46:53 -> <init>
+    1:1:void <clinit>():45:45 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$1):45:45 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection):56:56 -> <init>
+    3:10:void <init>(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection):51:58 -> <init>
     void acceptCompanionMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> a
     void acceptDesugaredLibraryRetargeterDispatchClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> a
     void acceptEmulatedInterfaceMarkerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClasspathClass) -> a
     void acceptInterfaceInjection(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass) -> a
-    1:1:void acceptCompanionClassClinit(com.android.tools.r8.graph.ProgramMethod):85:85 -> a
-    2:5:void finalizeDesugaring():95:98 -> a
+    1:1:void warnMissingInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper):70:70 -> a
+    2:2:void acceptCompanionClassClinit(com.android.tools.r8.graph.ProgramMethod):96:96 -> a
+    3:6:void finalizeDesugaring():106:109 -> a
     void acceptWrapperClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> b
-    1:1:void acceptAPIConversionCallback(com.android.tools.r8.graph.ProgramMethod):103:103 -> b
-    1:1:void acceptForwardingMethod(com.android.tools.r8.graph.ProgramMethod):80:80 -> c
-    1:3:void addMethodToReprocess(com.android.tools.r8.graph.ProgramMethod):57:59 -> d
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$R8PostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.DE0:
+    1:1:void acceptAPIConversionCallback(com.android.tools.r8.graph.ProgramMethod):114:114 -> b
+    1:1:void acceptForwardingMethod(com.android.tools.r8.graph.ProgramMethod):91:91 -> c
+    1:3:void addMethodToReprocess(com.android.tools.r8.graph.ProgramMethod):62:64 -> d
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$R8PostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.GE0:
     com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection desugaring -> b
+    java.util.function.BiConsumer missingClassConsumer -> c
     com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions additions -> a
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():112:112 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection):119:121 -> <init>
-    1:2:void acceptEmulatedInterfaceMarkerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClasspathClass):132:133 -> a
-    3:3:void acceptInterfaceInjection(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass):138:138 -> a
-    4:4:void acceptDesugaredLibraryRetargeterDispatchClasspathClass(com.android.tools.r8.graph.DexClasspathClass):143:143 -> a
-    5:5:void acceptCompanionClassClinit(com.android.tools.r8.graph.ProgramMethod):154:154 -> a
-    6:6:void acceptCompanionMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):160:160 -> a
-    1:2:void acceptAPIConversionCallback(com.android.tools.r8.graph.ProgramMethod):165:166 -> b
-    3:3:void acceptWrapperClasspathClass(com.android.tools.r8.graph.DexClasspathClass):171:171 -> b
-    1:1:void acceptForwardingMethod(com.android.tools.r8.graph.ProgramMethod):148:148 -> c
-com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.internal.OJ0:
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():123:123 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,java.util.function.BiConsumer):133:136 -> <init>
+    1:1:void warnMissingInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper):142:142 -> a
+    2:3:void acceptEmulatedInterfaceMarkerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClasspathClass):153:154 -> a
+    4:4:void acceptInterfaceInjection(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass):159:159 -> a
+    5:5:void acceptDesugaredLibraryRetargeterDispatchClasspathClass(com.android.tools.r8.graph.DexClasspathClass):164:164 -> a
+    6:6:void acceptCompanionClassClinit(com.android.tools.r8.graph.ProgramMethod):175:175 -> a
+    7:7:void acceptCompanionMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):181:181 -> a
+    1:2:void acceptAPIConversionCallback(com.android.tools.r8.graph.ProgramMethod):186:187 -> b
+    3:3:void acceptWrapperClasspathClass(com.android.tools.r8.graph.DexClasspathClass):192:192 -> b
+    1:1:void acceptForwardingMethod(com.android.tools.r8.graph.ProgramMethod):169:169 -> c
+com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.internal.RJ0:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
     boolean $assertionsDisabled -> c
@@ -80449,7 +80542,7 @@ com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.
     1:3:void <init>(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexItemFactory):57:59 -> <init>
     1:14:void process(com.android.tools.r8.graph.DexApplication$Builder):64:77 -> a
     15:15:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):87:87 -> a
-    16:17:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.hasVirtualMethodWithSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):269:270 -> a
+    16:17:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.hasVirtualMethodWithSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):271:272 -> a
     16:17:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):88 -> a
     18:22:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):89:93 -> a
     23:23:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):90:90 -> a
@@ -80468,52 +80561,53 @@ com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.
     44:45:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):114:115 -> a
     46:46:void com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.buildCovariantReturnTypeMethodsForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.List):135:135 -> a
     46:46:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):116 -> a
-    47:52:java.util.Set com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.getCovariantReturnTypes(com.android.tools.r8.graph.ProgramMethod):192:197 -> a
+    47:52:java.util.Set com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.getCovariantReturnTypes(com.android.tools.r8.graph.ProgramMethod):194:199 -> a
     47:52:void com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.buildCovariantReturnTypeMethodsForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.List):136 -> a
     47:52:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):116 -> a
-    53:53:java.util.Set com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.getCovariantReturnTypes(com.android.tools.r8.graph.ProgramMethod):195:195 -> a
+    53:53:java.util.Set com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.getCovariantReturnTypes(com.android.tools.r8.graph.ProgramMethod):197:197 -> a
     53:53:void com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.buildCovariantReturnTypeMethodsForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.List):136 -> a
     53:53:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):116 -> a
     54:57:void com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.buildCovariantReturnTypeMethodsForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.List):136:139 -> a
     54:57:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):116 -> a
     58:59:boolean methodHasCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedMethod):122:123 -> a
-    60:83:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):150:173 -> a
-    84:84:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.keepIf(java.util.function.Predicate):200:200 -> a
-    84:84:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):173 -> a
-    85:91:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):173:179 -> a
-    92:92:boolean lambda$buildCovariantReturnTypeMethod$2(com.android.tools.r8.graph.DexAnnotation):173:173 -> a
-    93:107:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):210:224 -> a
-    108:112:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):218:222 -> a
-    113:113:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):219:219 -> a
-    114:114:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    114:114:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):219 -> a
-    115:115:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    115:115:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    115:115:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):219 -> a
-    116:138:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):219:241 -> a
-    139:139:boolean com.android.tools.r8.graph.DexValue.isDexValueAnnotation():0:0 -> a
-    139:139:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):241 -> a
-    140:142:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):241:243 -> a
-    143:147:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):232:236 -> a
-    148:148:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):233:233 -> a
-    149:149:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    149:149:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):233 -> a
-    150:150:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    150:150:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    150:150:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):233 -> a
-    151:173:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):233:255 -> a
-    174:174:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):252:252 -> a
-    175:175:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    175:175:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):252 -> a
-    176:176:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    176:176:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    176:176:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):252 -> a
-    177:177:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):252:252 -> a
-    178:178:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):260:260 -> a
-    179:179:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):264:264 -> a
-    179:179:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):260 -> a
+    60:84:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):150:174 -> a
+    85:85:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.keepIf(java.util.function.Predicate):200:200 -> a
+    85:85:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):174 -> a
+    86:91:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):171:176 -> a
+    92:98:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):175:181 -> a
+    99:99:boolean lambda$buildCovariantReturnTypeMethod$2(com.android.tools.r8.graph.DexAnnotation):174:174 -> a
+    100:114:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):212:226 -> a
+    115:119:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):220:224 -> a
+    120:120:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):221:221 -> a
+    121:121:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    121:121:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):221 -> a
+    122:122:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    122:122:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    122:122:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):221 -> a
+    123:145:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):221:243 -> a
+    146:146:boolean com.android.tools.r8.graph.DexValue.isDexValueAnnotation():0:0 -> a
+    146:146:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):243 -> a
+    147:149:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):243:245 -> a
+    150:154:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):234:238 -> a
+    155:155:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):235:235 -> a
+    156:156:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    156:156:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):235 -> a
+    157:157:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    157:157:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    157:157:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):235 -> a
+    158:180:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):235:257 -> a
+    181:181:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):254:254 -> a
+    182:182:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    182:182:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):254 -> a
+    183:183:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    183:183:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    183:183:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):254 -> a
+    184:184:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):254:254 -> a
+    185:185:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):262:262 -> a
+    186:186:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):266:266 -> a
+    186:186:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):262 -> a
     1:1:boolean lambda$updateClass$0(com.android.tools.r8.graph.DexAnnotation):99:99 -> b
-com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.YM0:
+com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.bN0:
     com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection INSTANCE -> a
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():24:24 -> <init>
@@ -80527,9 +80621,9 @@ com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection -> com.an
     void withDesugaredLibraryAPIConverter(java.util.function.Consumer) -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo getRetargetingInfo() -> b
     1:1:com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection getInstance():28:28 -> c
-com.android.tools.r8.ir.desugar.FreshLocalProvider -> com.android.tools.r8.internal.XP0:
+com.android.tools.r8.ir.desugar.FreshLocalProvider -> com.android.tools.r8.internal.aQ0:
     int getFreshLocal(int) -> a
-com.android.tools.r8.ir.desugar.InvokeToPrivateRewriter -> com.android.tools.r8.internal.fY0:
+com.android.tools.r8.ir.desugar.InvokeToPrivateRewriter -> com.android.tools.r8.internal.iY0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():28:28 -> <init>
@@ -80538,7 +80632,7 @@ com.android.tools.r8.ir.desugar.InvokeToPrivateRewriter -> com.android.tools.r8.
     15:15:boolean com.android.tools.r8.ir.desugar.InvokeToPrivateRewriter.isInvokingPrivateMethodOnSelf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):73:73 -> a
     15:15:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):56 -> a
     16:22:com.android.tools.r8.graph.DexEncodedMethod privateMethodInvokedOnSelf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):60:66 -> a
-com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.internal.c41:
+com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.internal.f41:
     com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring desugaring -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.LambdaDescriptor descriptor -> d
@@ -80550,187 +80644,195 @@ com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.internal.c41
     com.android.tools.r8.graph.DexMethod constructor -> e
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> j
     com.android.tools.r8.graph.DexProgramClass clazz -> i
-    1:7:void <clinit>():64:70 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.LambdaDescriptor):89:89 -> <init>
-    2:33:void <init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.LambdaDescriptor):82:113 -> <init>
-    1:4:void setClass(com.android.tools.r8.graph.DexProgramClass):126:129 -> a
-    5:5:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):133:133 -> a
-    6:26:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):255:275 -> a
-    6:26:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):134 -> a
-    27:27:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):261:261 -> a
-    27:27:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):134 -> a
-    28:28:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):260:260 -> a
-    28:28:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):134 -> a
-    29:37:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeInstanceFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):232:240 -> a
-    29:37:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):135 -> a
-    38:38:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.FieldAccessFlags.createPublicFinalSynthetic():80:80 -> a
-    38:38:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeInstanceFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):241 -> a
-    38:38:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):135 -> a
-    39:45:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeInstanceFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):242:248 -> a
-    39:45:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):135 -> a
-    46:58:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeInstanceFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):238:250 -> a
-    46:58:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):135 -> a
-    59:72:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):196:209 -> a
-    59:72:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):136 -> a
-    73:81:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass):26:34 -> a
-    73:81:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):210 -> a
-    73:81:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):136 -> a
-    82:106:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass):31:55 -> a
-    82:106:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):210 -> a
-    82:106:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):136 -> a
-    107:107:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):210:210 -> a
-    107:107:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):136 -> a
-    108:130:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):200:222 -> a
-    108:130:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):136 -> a
-    131:142:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass):24:35 -> a
-    131:142:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):223 -> a
-    131:142:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):136 -> a
-    143:143:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):223:223 -> a
-    143:143:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):136 -> a
-    144:156:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215:227 -> a
-    144:156:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):136 -> a
-    157:171:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):155:169 -> a
-    157:171:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):137 -> a
-    172:198:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):161:187 -> a
-    172:198:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):137 -> a
-    199:204:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):17:22 -> a
-    199:204:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):188 -> a
-    199:204:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):137 -> a
-    205:205:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):188:188 -> a
-    205:205:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):137 -> a
-    206:221:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):176:191 -> a
-    206:221:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):137 -> a
-    222:227:com.android.tools.r8.graph.DexField getCaptureField(int):141:146 -> a
-    228:228:com.android.tools.r8.graph.DexField getCaptureField(int):143:143 -> a
-    229:230:boolean canAccessModifyLambdaImplMethod():309:310 -> a
-    231:231:boolean com.android.tools.r8.utils.InternalOptions.canAccessModifyLambdaImplementationMethods(com.android.tools.r8.graph.AppView):1665:1665 -> a
-    231:231:boolean canAccessModifyLambdaImplMethod():310 -> a
-    232:233:boolean canAccessModifyLambdaImplMethod():311:312 -> a
-    234:234:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.delegatesToLambdaImplMethod(com.android.tools.r8.graph.DexItemFactory):182:182 -> a
-    234:234:boolean canAccessModifyLambdaImplMethod():312 -> a
-    235:235:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
-    235:235:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.delegatesToLambdaImplMethod(com.android.tools.r8.graph.DexItemFactory):182 -> a
-    235:235:boolean canAccessModifyLambdaImplMethod():312 -> a
-    236:237:boolean canAccessModifyLambdaImplMethod():312:313 -> a
-    238:240:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.ProgramMethod):370:370 -> a
-    243:265:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.ProgramMethod):373:395 -> a
-    266:269:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.ProgramMethod):394:397 -> a
-    1:6:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):317:322 -> b
+    1:7:void <clinit>():60:66 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.LambdaDescriptor):85:85 -> <init>
+    2:33:void <init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.LambdaDescriptor):78:109 -> <init>
+    1:4:void setClass(com.android.tools.r8.graph.DexProgramClass):122:125 -> a
+    5:5:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):129:129 -> a
+    6:14:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):237:245 -> a
+    6:14:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):130 -> a
+    15:24:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):244:253 -> a
+    15:24:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):130 -> a
+    25:25:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):241:241 -> a
+    25:25:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):130 -> a
+    26:26:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):240:240 -> a
+    26:26:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):130 -> a
+    27:33:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeInstanceFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):220:226 -> a
+    27:33:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):131 -> a
+    34:34:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.FieldAccessFlags.createPublicFinalSynthetic():80:80 -> a
+    34:34:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeInstanceFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):227 -> a
+    34:34:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):131 -> a
+    35:38:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeInstanceFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):227:230 -> a
+    35:38:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):131 -> a
+    39:47:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeInstanceFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):224:232 -> a
+    39:47:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):131 -> a
+    48:59:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):188:199 -> a
+    48:59:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):132 -> a
+    60:68:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass):26:34 -> a
+    60:68:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):200 -> a
+    60:68:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):132 -> a
+    69:93:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass):31:55 -> a
+    69:93:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):200 -> a
+    69:93:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):132 -> a
+    94:95:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):200:201 -> a
+    94:95:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):132 -> a
+    96:109:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):196:209 -> a
+    96:109:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):132 -> a
+    110:110:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):208:208 -> a
+    110:110:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):132 -> a
+    111:122:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass):24:35 -> a
+    111:122:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):211 -> a
+    111:122:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):132 -> a
+    123:124:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):211:212 -> a
+    123:124:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):132 -> a
+    125:135:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):205:215 -> a
+    125:135:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):132 -> a
+    136:146:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):151:161 -> a
+    136:146:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):133 -> a
+    147:151:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):160:164 -> a
+    147:151:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):133 -> a
+    152:169:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):157:174 -> a
+    152:169:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):133 -> a
+    170:170:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):173:173 -> a
+    170:170:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):133 -> a
+    171:176:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):17:22 -> a
+    171:176:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):180 -> a
+    171:176:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):133 -> a
+    177:178:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):180:181 -> a
+    177:178:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):133 -> a
+    179:192:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):170:183 -> a
+    179:192:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):133 -> a
+    193:198:com.android.tools.r8.graph.DexField getCaptureField(int):137:142 -> a
+    199:199:com.android.tools.r8.graph.DexField getCaptureField(int):139:139 -> a
+    200:201:boolean canAccessModifyLambdaImplMethod():287:288 -> a
+    202:202:boolean com.android.tools.r8.utils.InternalOptions.canAccessModifyLambdaImplementationMethods(com.android.tools.r8.graph.AppView):1665:1665 -> a
+    202:202:boolean canAccessModifyLambdaImplMethod():288 -> a
+    203:204:boolean canAccessModifyLambdaImplMethod():289:290 -> a
+    205:205:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.delegatesToLambdaImplMethod(com.android.tools.r8.graph.DexItemFactory):182:182 -> a
+    205:205:boolean canAccessModifyLambdaImplMethod():290 -> a
+    206:206:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    206:206:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.delegatesToLambdaImplMethod(com.android.tools.r8.graph.DexItemFactory):182 -> a
+    206:206:boolean canAccessModifyLambdaImplMethod():290 -> a
+    207:208:boolean canAccessModifyLambdaImplMethod():290:291 -> a
+    209:211:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.ProgramMethod):348:348 -> a
+    214:236:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.ProgramMethod):351:373 -> a
+    237:240:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.ProgramMethod):372:375 -> a
+    1:6:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):295:300 -> b
     7:7:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.delegatesToLambdaImplMethod(com.android.tools.r8.graph.DexItemFactory):182:182 -> b
-    7:7:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):322 -> b
+    7:7:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):300 -> b
     8:8:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> b
     8:8:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.delegatesToLambdaImplMethod(com.android.tools.r8.graph.DexItemFactory):182 -> b
-    8:8:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):322 -> b
-    9:50:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):322:363 -> b
+    8:8:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):300 -> b
+    9:50:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):300:341 -> b
     51:53:com.android.tools.r8.graph.DexString com.android.tools.r8.utils.DesugarUtils.appendFullyQualifiedHolderToMethodName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):14:14 -> b
-    51:53:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):363 -> b
-    54:54:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):360:360 -> b
-    55:57:com.android.tools.r8.graph.DexString generateUniqueLambdaMethodName():457:459 -> b
-    1:2:com.android.tools.r8.graph.DexProgramClass getLambdaProgramClass():117:118 -> c
-    3:21:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):282:300 -> c
-    22:22:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):284:284 -> c
-    23:25:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createInterfaceMethodTarget(com.android.tools.r8.graph.ProgramMethod):451:453 -> c
-    23:25:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):286 -> c
-    26:28:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):294:296 -> c
-    29:49:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createConstructorTarget(com.android.tools.r8.graph.ProgramMethod):425:445 -> c
-    29:49:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):288 -> c
-    50:52:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createConstructorTarget(com.android.tools.r8.graph.ProgramMethod):444:446 -> c
-    50:52:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):288 -> c
-    53:53:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):298:298 -> c
-    54:55:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):290:291 -> c
-    56:71:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createStaticMethodTarget(com.android.tools.r8.graph.ProgramMethod):403:418 -> c
-    56:71:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):292 -> c
-    72:76:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createStaticMethodTarget(com.android.tools.r8.graph.ProgramMethod):415:419 -> c
-    72:76:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):292 -> c
-    1:1:boolean isStateless():150:150 -> d
+    51:53:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):341 -> b
+    54:54:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):338:338 -> b
+    55:57:com.android.tools.r8.graph.DexString generateUniqueLambdaMethodName():435:437 -> b
+    1:2:com.android.tools.r8.graph.DexProgramClass getLambdaProgramClass():113:114 -> c
+    3:21:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):260:278 -> c
+    22:22:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):262:262 -> c
+    23:25:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createInterfaceMethodTarget(com.android.tools.r8.graph.ProgramMethod):429:431 -> c
+    23:25:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):264 -> c
+    26:28:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):272:274 -> c
+    29:49:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createConstructorTarget(com.android.tools.r8.graph.ProgramMethod):403:423 -> c
+    29:49:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):266 -> c
+    50:52:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createConstructorTarget(com.android.tools.r8.graph.ProgramMethod):422:424 -> c
+    50:52:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):266 -> c
+    53:53:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):276:276 -> c
+    54:55:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):268:269 -> c
+    56:71:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createStaticMethodTarget(com.android.tools.r8.graph.ProgramMethod):381:396 -> c
+    56:71:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):270 -> c
+    72:76:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createStaticMethodTarget(com.android.tools.r8.graph.ProgramMethod):393:397 -> c
+    72:76:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):270 -> c
+    1:1:boolean isStateless():146:146 -> d
     2:2:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isStateless():187:187 -> d
-    2:2:boolean isStateless():150 -> d
-    3:3:boolean doesNotNeedAccessor(com.android.tools.r8.graph.ProgramMethod):305:305 -> d
-com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.internal.U31:
+    2:2:boolean isStateless():146 -> d
+    3:3:boolean doesNotNeedAccessor(com.android.tools.r8.graph.ProgramMethod):283:283 -> d
+com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.internal.X31:
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> f
     boolean $assertionsDisabled -> g
-    1:1:void <clinit>():702:702 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):704:705 -> <init>
-    1:23:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):713:735 -> a
-    24:51:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.AccessorMethodSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):16:43 -> a
-    24:51:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):736 -> a
-    52:52:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.AccessorMethodSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):41:41 -> a
-    52:52:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):736 -> a
-    53:58:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.AccessorMethodSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):32:37 -> a
-    53:58:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):736 -> a
-    59:82:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.AccessorMethodSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):22:45 -> a
-    59:82:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):736 -> a
-    83:86:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):736:739 -> a
-    87:87:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
-    87:87:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):739 -> a
-    88:90:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):739:741 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$D8SpecificTarget -> com.android.tools.r8.internal.V31:
+    1:1:void <clinit>():679:679 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):681:682 -> <init>
+    1:20:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):690:709 -> a
+    21:48:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.AccessorMethodSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):16:43 -> a
+    21:48:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):710 -> a
+    49:49:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.AccessorMethodSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):41:41 -> a
+    49:49:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):710 -> a
+    50:55:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.AccessorMethodSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):32:37 -> a
+    50:55:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):710 -> a
+    56:79:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.AccessorMethodSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):22:45 -> a
+    56:79:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):710 -> a
+    80:83:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):710:713 -> a
+    84:84:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
+    84:84:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):713 -> a
+    85:87:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):713:715 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$D8SpecificTarget -> com.android.tools.r8.internal.Y31:
     boolean $assertionsDisabled -> f
-    1:1:void <clinit>():505:505 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):507:508 -> <init>
-com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.internal.W31:
+    1:1:void <clinit>():483:483 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):485:486 -> <init>
+com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.internal.Z31:
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> g
     boolean $assertionsDisabled -> h
-    1:1:void <clinit>():637:637 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):639:640 -> <init>
-    1:33:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):650:682 -> a
-    34:34:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    34:34:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):682 -> a
-    35:38:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):682:685 -> a
-    39:39:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
-    39:39:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):685 -> a
-    40:40:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):686:686 -> a
-    41:41:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    41:41:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):686 -> a
-    42:51:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):686:695 -> a
-    52:69:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):659:676 -> a
-    70:70:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):675:675 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.internal.X31:
+    1:1:void <clinit>():615:615 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):617:618 -> <init>
+    1:32:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):628:659 -> a
+    33:33:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    33:33:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):659 -> a
+    34:37:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):659:662 -> a
+    38:38:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
+    38:38:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):662 -> a
+    39:39:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):663:663 -> a
+    40:40:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    40:40:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):663 -> a
+    41:50:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):663:672 -> a
+    51:67:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):637:653 -> a
+    68:68:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):652:652 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.internal.a41:
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> g
     boolean $assertionsDisabled -> h
-    1:1:void <clinit>():553:553 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):555:556 -> <init>
-    1:37:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):565:601 -> a
-    38:38:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    38:38:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):601 -> a
-    39:42:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):601:604 -> a
-    43:43:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
-    43:43:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):604 -> a
-    44:44:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):605:605 -> a
-    45:45:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    45:45:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):605 -> a
-    46:55:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):605:614 -> a
-    56:72:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):576:592 -> a
-    73:77:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):591:595 -> a
-    78:78:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):594:594 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InvalidLambdaImplTarget -> com.android.tools.r8.internal.Y31:
+    1:1:void <clinit>():531:531 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):533:534 -> <init>
+    1:37:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):543:579 -> a
+    38:38:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    38:38:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):579 -> a
+    39:42:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):579:582 -> a
+    43:43:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
+    43:43:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):582 -> a
+    44:44:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):583:583 -> a
+    45:45:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    45:45:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):583 -> a
+    46:55:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):583:592 -> a
+    56:72:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):554:570 -> a
+    73:77:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):569:573 -> a
+    78:78:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):572:572 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$InvalidLambdaImplTarget -> com.android.tools.r8.internal.b41:
     com.android.tools.r8.graph.DexType exceptionType -> f
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexType):624:625 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexType):602:603 -> <init>
     com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer) -> a
-com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.internal.Z31:
-    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):516:516 -> <init>
+com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.internal.c41:
+    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):494:494 -> <init>
     com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer) -> a
-com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.internal.a41:
+com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.internal.d41:
     com.android.tools.r8.graph.ProgramMethod target -> g
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):533:534 -> <init>
-    1:4:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):542:545 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.internal.b41:
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):511:512 -> <init>
+    1:4:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):520:523 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.internal.e41:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> b
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexMethod callTarget -> a
     boolean hasEnsuredAccessibility -> c
-    1:1:void <clinit>():465:465 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):473:477 -> <init>
+    1:1:void <clinit>():443:443 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):451:455 -> <init>
     com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer) -> a
-    1:1:void ensureAccessibilityIfNeeded():486:486 -> a
-    2:5:void com.android.tools.r8.ir.desugar.LambdaClass$Target.ensureAccessibilityIfNeeded(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):493:496 -> a
-    2:5:void ensureAccessibilityIfNeeded():486 -> a
-    1:4:void ensureAccessibilityIfNeeded(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):493:496 -> b
-com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.internal.d41:
+    1:1:void ensureAccessibilityIfNeeded():464:464 -> a
+    2:5:void com.android.tools.r8.ir.desugar.LambdaClass$Target.ensureAccessibilityIfNeeded(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):471:474 -> a
+    2:5:void ensureAccessibilityIfNeeded():464 -> a
+    1:4:void ensureAccessibilityIfNeeded(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):471:474 -> b
+com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.internal.g41:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
-com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.internal.e41:
+com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.internal.h41:
     com.android.tools.r8.graph.MethodAccessFlags targetAccessFlags -> j
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexType targetHolder -> k
@@ -80780,7 +80882,7 @@ com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.interna
     257:260:boolean isSameOrDerived(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):439:442 -> a
     1:1:com.android.tools.r8.graph.DexMethod getMainMethod():66:66 -> b
     2:3:com.android.tools.r8.ir.desugar.LambdaDescriptor tryInfer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):254:255 -> b
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.internal.i41:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.internal.l41:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():39:39 -> <clinit>
     1:12:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):71:82 -> a
@@ -80806,7 +80908,7 @@ com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.
     158:158:int com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.prepareParameterValue(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):340:340 -> a
     158:158:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):240 -> a
     159:160:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):244:245 -> a
-    161:161:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.isInterface():501:501 -> a
+    161:161:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.isInterface():479:479 -> a
     161:161:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):245 -> a
     162:162:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):245:245 -> a
     163:174:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):244:255 -> a
@@ -80839,12 +80941,12 @@ com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.
     324:327:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):484:487 -> a
     328:328:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):478:478 -> a
     329:372:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):470:513 -> a
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode$1 -> com.android.tools.r8.internal.h41:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode$1 -> com.android.tools.r8.internal.k41:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():468:468 -> <clinit>
-com.android.tools.r8.ir.desugar.LocalStackAllocator -> com.android.tools.r8.internal.C51:
+com.android.tools.r8.ir.desugar.LocalStackAllocator -> com.android.tools.r8.internal.F51:
     void allocateLocalStack(int) -> a
-com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.ka1:
+com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.na1:
     java.util.List desugarings -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring nestBasedAccessDesugaring -> c
@@ -80886,14 +80988,14 @@ com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection -> com
     119:120:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getInterfaceMethodPostProcessingDesugaringR8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.function.Predicate,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):338:339 -> a
     121:122:void withDesugaredLibraryAPIConverter(java.util.function.Consumer):353:354 -> a
     1:2:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):117:118 -> b
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> b
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> b
     3:3:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):118 -> b
     4:9:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):118:123 -> b
     10:17:void ensureCfCode(com.android.tools.r8.graph.ProgramMethod):138:145 -> b
-    18:18:com.android.tools.r8.position.MethodPosition com.android.tools.r8.graph.ProgramMethod.getPosition():113:113 -> b
+    18:18:com.android.tools.r8.position.MethodPosition com.android.tools.r8.graph.ProgramMethod.getPosition():118:118 -> b
     18:18:void ensureCfCode(com.android.tools.r8.graph.ProgramMethod):146 -> b
-    19:19:com.android.tools.r8.position.MethodPosition com.android.tools.r8.graph.DexEncodedMethod.getPosition():1382:1382 -> b
-    19:19:com.android.tools.r8.position.MethodPosition com.android.tools.r8.graph.ProgramMethod.getPosition():113 -> b
+    19:19:com.android.tools.r8.position.MethodPosition com.android.tools.r8.graph.DexEncodedMethod.getPosition():1325:1325 -> b
+    19:19:com.android.tools.r8.position.MethodPosition com.android.tools.r8.graph.ProgramMethod.getPosition():118 -> b
     19:19:void ensureCfCode(com.android.tools.r8.graph.ProgramMethod):146 -> b
     20:20:void ensureCfCode(com.android.tools.r8.graph.ProgramMethod):146:146 -> b
     21:21:void ensureCfCode(com.android.tools.r8.graph.ProgramMethod):142:142 -> b
@@ -80902,7 +81004,7 @@ com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection -> com
     1:6:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToDexNonDesugar(com.android.tools.r8.graph.AppView):128:133 -> c
     7:24:boolean noDesugaringBecauseOfImpreciseDesugaring(com.android.tools.r8.graph.ProgramMethod):216:233 -> c
     25:25:boolean lambda$noDesugaringBecauseOfImpreciseDesugaring$5(com.android.tools.r8.ir.desugar.CfInstructionDesugaring):229:229 -> c
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.internal.Qe1:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.internal.Te1:
     1:1:void <init>():23:23 -> <init>
     void forAllRewrittenTypes(java.util.function.Consumer) -> a
     boolean isRewriting() -> a
@@ -80911,7 +81013,7 @@ com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.in
     1:1:boolean hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):34:34 -> a
     2:6:boolean hasRewrittenTypeInSignature(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.AppView):38:42 -> a
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView) -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.internal.Oe1:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.internal.Re1:
     java.util.Map rewritten -> b
     java.util.Map initialPrefixes -> c
     com.android.tools.r8.graph.DexItemFactory factory -> d
@@ -80960,14 +81062,14 @@ com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapp
     21:31:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> b
     32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):172:172 -> b
     32:32:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.internal.Pe1:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.internal.Se1:
     1:1:void <init>():207:207 -> <init>
     void forAllRewrittenTypes(java.util.function.Consumer) -> a
     boolean isRewriting() -> a
     void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
     boolean shouldRewriteTypeName(java.lang.String) -> a
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView) -> b
-com.android.tools.r8.ir.desugar.ProgramAdditions -> com.android.tools.r8.internal.lf1:
+com.android.tools.r8.ir.desugar.ProgramAdditions -> com.android.tools.r8.internal.of1:
     java.util.Map additions -> b
     java.util.Set added -> a
     boolean $assertionsDisabled -> c
@@ -80978,7 +81080,7 @@ com.android.tools.r8.ir.desugar.ProgramAdditions -> com.android.tools.r8.interna
     11:11:void apply(java.util.concurrent.ExecutorService):45:45 -> a
     12:13:void lambda$apply$1(com.android.tools.r8.graph.DexProgramClass,java.util.List):48:49 -> a
     1:1:void accept(java.lang.Object,java.lang.Object):25:25 -> accept
-com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.internal.RA0:
+com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.internal.UA0:
     1:27:com.android.tools.r8.graph.CfCode IntegerMethods_parseIntSubsequenceWithRadixDalvik(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2168:2194 -> A
     28:47:com.android.tools.r8.graph.CfCode IntegerMethods_parseIntSubsequenceWithRadixDalvik(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2190:2209 -> A
     48:63:com.android.tools.r8.graph.CfCode IntegerMethods_parseIntSubsequenceWithRadixDalvik(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2205:2220 -> A
@@ -82055,48 +82157,48 @@ com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools
     22:35:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6677:6690 -> z0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6684:6684 -> z0
     37:67:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6665:6695 -> z0
-com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.internal.aC0:
+com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.internal.dC0:
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter createRewriter(com.android.tools.r8.cf.code.CfLogicalBinop$Opcode):15:15 -> a
     2:2:com.android.tools.r8.cf.code.CfInstruction lambda$createRewriter$0(com.android.tools.r8.cf.code.CfLogicalBinop$Opcode,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):15:15 -> a
     3:3:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteLogicalAnd():19:19 -> a
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteLogicalOr():23:23 -> b
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteLogicalXor():27:27 -> c
-com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.internal.sI0:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.internal.vI0:
     1:1:com.android.tools.r8.graph.CfCode generateListOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):31:31 -> a
     2:21:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):40:59 -> a
     22:22:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):56:56 -> a
     23:39:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):53:69 -> a
     1:1:com.android.tools.r8.graph.CfCode generateSetOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):35:35 -> b
-com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.internal.tI0:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.internal.wI0:
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteListOfEmpty():16:16 -> a
     2:2:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteToCollectionMethod(java.lang.String):28:28 -> a
     3:5:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteToCollectionMethod$0(java.lang.String,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):29:31 -> a
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteMapOfEmpty():24:24 -> b
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteSetOfEmpty():20:20 -> c
-com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.internal.EP0:
+com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.internal.HP0:
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteHashCode():16:16 -> a
     2:5:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteHashCode$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):17:20 -> a
     6:6:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteHashCode$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):19:19 -> a
-com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.internal.d61:
+com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.internal.g61:
     1:1:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteCompare$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):17:17 -> a
     2:2:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteCompare():17:17 -> a
-com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.internal.Pa1:
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.internal.Sa1:
     1:2:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteToAddInstruction$1(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):30:31 -> a
     3:3:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteAsIdentity():36:36 -> a
     1:4:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteToInvokeMath$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):20:23 -> b
     5:5:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteToAddInstruction():29:29 -> b
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteToInvokeMath():19:19 -> c
-com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites$1 -> com.android.tools.r8.internal.Oa1:
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites$1 -> com.android.tools.r8.internal.Ra1:
     1:1:void <init>():36:36 -> <init>
     1:1:java.util.Collection rewrite(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.LocalStackAllocator):41:41 -> a
-com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites -> com.android.tools.r8.internal.kd1:
+com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites -> com.android.tools.r8.internal.nd1:
     1:4:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteToArraysHashCode$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):24:27 -> a
     5:5:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteRequireNonNull():33:33 -> a
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteToArraysHashCode():23:23 -> b
-com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites$1 -> com.android.tools.r8.internal.jd1:
+com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites$1 -> com.android.tools.r8.internal.md1:
     1:1:void <init>():33:33 -> <init>
     1:2:java.util.Collection rewrite(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.LocalStackAllocator):39:40 -> a
-com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites -> com.android.tools.r8.internal.Ad1:
+com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites -> com.android.tools.r8.internal.Dd1:
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter createRewriter(java.util.function.Function,java.lang.String):20:20 -> a
     2:5:com.android.tools.r8.cf.code.CfInstruction lambda$createRewriter$0(java.util.function.Function,java.lang.String,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):21:24 -> a
     6:6:com.android.tools.r8.cf.code.CfInstruction lambda$createRewriter$0(java.util.function.Function,java.lang.String,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):23:23 -> a
@@ -82108,10 +82210,10 @@ com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites -> com.android.
     2:2:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteLongOrElseGet():41:41 -> c
     1:1:com.android.tools.r8.graph.DexType lambda$rewriteOrElseGet$1(com.android.tools.r8.graph.DexItemFactory):29:29 -> d
     2:2:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteOrElseGet():29:29 -> d
-com.android.tools.r8.ir.desugar.backports.SparseArrayMethodRewrites -> com.android.tools.r8.internal.In1:
+com.android.tools.r8.ir.desugar.backports.SparseArrayMethodRewrites -> com.android.tools.r8.internal.An1:
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteSet():17:17 -> a
     2:2:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteSet$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):18:18 -> a
-com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass -> com.android.tools.r8.internal.BJ0:
+com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass -> com.android.tools.r8.internal.EJ0:
     com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference reference -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexField constantValueField -> d
@@ -82130,88 +82232,88 @@ com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass -> com.andr
     3:3:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.FieldAccessFlags.createPrivateStaticSynthetic():75:75 -> a
     3:3:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):129 -> a
     3:3:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):120 -> a
-    4:9:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):129:134 -> a
-    4:9:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):120 -> a
-    10:10:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.FieldAccessFlags.createPrivateStaticSynthetic():75:75 -> a
-    10:10:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):135 -> a
-    10:10:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):120 -> a
-    11:14:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):135:138 -> a
-    11:14:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):120 -> a
-    15:15:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):126:126 -> a
-    15:15:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):120 -> a
-    16:16:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):125:125 -> a
-    16:16:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):120 -> a
-    17:19:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):144:146 -> a
-    17:19:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    20:30:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):186:196 -> a
-    20:30:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):147 -> a
-    20:30:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    31:31:void com.android.tools.r8.cf.code.CfFieldInstruction.<init>(int,com.android.tools.r8.graph.DexField):46:46 -> a
-    31:31:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):196 -> a
-    31:31:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):147 -> a
-    31:31:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    32:41:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):196:205 -> a
-    32:41:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):147 -> a
-    32:41:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    42:42:void com.android.tools.r8.cf.code.CfFieldInstruction.<init>(int,com.android.tools.r8.graph.DexField):46:46 -> a
-    42:42:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):205 -> a
-    42:42:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):147 -> a
-    42:42:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    43:46:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):205:208 -> a
-    43:46:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):147 -> a
-    43:46:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    47:71:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.invokeBootstrapMethod(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):156:180 -> a
-    47:71:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):208 -> a
-    47:71:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):147 -> a
-    47:71:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    72:72:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):209:209 -> a
-    72:72:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):147 -> a
-    72:72:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    73:73:void com.android.tools.r8.cf.code.CfFieldInstruction.<init>(int,com.android.tools.r8.graph.DexField):46:46 -> a
-    73:73:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):209 -> a
-    73:73:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):147 -> a
-    73:73:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    74:76:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):209:211 -> a
-    74:76:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):147 -> a
-    74:76:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    77:77:void com.android.tools.r8.cf.code.CfFieldInstruction.<init>(int,com.android.tools.r8.graph.DexField):46:46 -> a
-    77:77:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):211 -> a
-    77:77:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):147 -> a
-    77:77:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    78:85:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):211:218 -> a
-    78:85:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):147 -> a
-    78:85:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    86:89:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):216:219 -> a
-    86:89:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):147 -> a
-    86:89:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    90:106:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214:230 -> a
-    90:106:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):147 -> a
-    90:106:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    107:110:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):228:231 -> a
-    107:110:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):147 -> a
-    107:110:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    111:126:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):226:241 -> a
-    111:126:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):147 -> a
-    111:126:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    127:127:void com.android.tools.r8.cf.code.CfFieldInstruction.<init>(int,com.android.tools.r8.graph.DexField):46:46 -> a
-    127:127:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):241 -> a
-    127:127:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):147 -> a
-    127:127:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    128:142:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):241:255 -> a
-    128:142:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):147 -> a
-    128:142:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    143:158:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):245:260 -> a
-    143:158:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):147 -> a
-    143:158:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    159:163:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):147:151 -> a
-    159:163:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    164:164:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):143:143 -> a
-    164:164:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    165:165:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):142:142 -> a
-    165:165:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
-    166:167:com.android.tools.r8.graph.DexProgramClass getConstantDynamicProgramClass():266:267 -> a
-    168:170:void setClass(com.android.tools.r8.graph.DexProgramClass):271:273 -> a
-com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicInstructionDesugaring -> com.android.tools.r8.internal.CJ0:
+    4:8:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):129:133 -> a
+    4:8:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):120 -> a
+    9:9:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.FieldAccessFlags.createPrivateStaticSynthetic():75:75 -> a
+    9:9:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):134 -> a
+    9:9:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):120 -> a
+    10:12:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):134:136 -> a
+    10:12:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):120 -> a
+    13:13:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):126:126 -> a
+    13:13:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):120 -> a
+    14:14:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeStaticFields(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):125:125 -> a
+    14:14:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):120 -> a
+    15:17:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):142:144 -> a
+    15:17:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
+    18:28:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):183:193 -> a
+    18:28:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):145 -> a
+    18:28:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
+    29:29:void com.android.tools.r8.cf.code.CfFieldInstruction.<init>(int,com.android.tools.r8.graph.DexField):46:46 -> a
+    29:29:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):193 -> a
+    29:29:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):145 -> a
+    29:29:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
+    30:39:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):193:202 -> a
+    30:39:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):145 -> a
+    30:39:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
+    40:40:void com.android.tools.r8.cf.code.CfFieldInstruction.<init>(int,com.android.tools.r8.graph.DexField):46:46 -> a
+    40:40:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):202 -> a
+    40:40:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):145 -> a
+    40:40:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
+    41:44:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):202:205 -> a
+    41:44:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):145 -> a
+    41:44:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
+    45:69:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.invokeBootstrapMethod(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):153:177 -> a
+    45:69:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):205 -> a
+    45:69:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):145 -> a
+    45:69:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
+    70:70:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):206:206 -> a
+    70:70:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):145 -> a
+    70:70:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
+    71:71:void com.android.tools.r8.cf.code.CfFieldInstruction.<init>(int,com.android.tools.r8.graph.DexField):46:46 -> a
+    71:71:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):206 -> a
+    71:71:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):145 -> a
+    71:71:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
+    72:74:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):206:208 -> a
+    72:74:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):145 -> a
+    72:74:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
+    75:75:void com.android.tools.r8.cf.code.CfFieldInstruction.<init>(int,com.android.tools.r8.graph.DexField):46:46 -> a
+    75:75:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):208 -> a
+    75:75:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):145 -> a
+    75:75:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
+    76:83:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):208:215 -> a
+    76:83:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):145 -> a
+    76:83:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
+    84:87:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):213:216 -> a
+    84:87:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):145 -> a
+    84:87:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
+    88:104:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):211:227 -> a
+    88:104:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):145 -> a
+    88:104:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
+    105:108:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):225:228 -> a
+    105:108:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):145 -> a
+    105:108:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
+    109:124:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):223:238 -> a
+    109:124:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):145 -> a
+    109:124:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
+    125:125:void com.android.tools.r8.cf.code.CfFieldInstruction.<init>(int,com.android.tools.r8.graph.DexField):46:46 -> a
+    125:125:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):238 -> a
+    125:125:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):145 -> a
+    125:125:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
+    126:140:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):238:252 -> a
+    126:140:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):145 -> a
+    126:140:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
+    141:156:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):242:257 -> a
+    141:156:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):145 -> a
+    141:156:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
+    157:160:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):145:148 -> a
+    157:160:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
+    161:161:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):141:141 -> a
+    161:161:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
+    162:162:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):140:140 -> a
+    162:162:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121 -> a
+    163:164:com.android.tools.r8.graph.DexProgramClass getConstantDynamicProgramClass():263:264 -> a
+    165:167:void setClass(com.android.tools.r8.graph.DexProgramClass):268:270 -> a
+com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicInstructionDesugaring -> com.android.tools.r8.internal.FJ0:
     java.util.Map dynamicConstantSyntheticsPerClass -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):35:35 -> <init>
@@ -82231,7 +82333,7 @@ com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicInstructionDesuga
     28:28:void lambda$createConstantDynamicClass$1(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):120:120 -> a
     1:3:com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass ensureConstantDynamicClass(com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer):86:88 -> b
     4:17:com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass ensureConstantDynamicClass(com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer):87:100 -> b
-com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference -> com.android.tools.r8.internal.DJ0:
+com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference -> com.android.tools.r8.internal.GJ0:
     java.lang.Object[] bootstrapMethodArguments -> d
     com.android.tools.r8.graph.DexString name -> a
     boolean $assertionsDisabled -> e
@@ -82245,7 +82347,7 @@ com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference -> com.
     1:1:com.android.tools.r8.graph.DexType getType():34:34 -> d
     1:7:boolean equals(java.lang.Object):48:54 -> equals
     1:1:int hashCode():59:59 -> hashCode
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPICallbackSynthesizor -> com.android.tools.r8.internal.LK0:
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPICallbackSynthesizor -> com.android.tools.r8.internal.OK0:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -82256,12 +82358,12 @@ com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPICallbackSynt
     1:7:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):58:64 -> a
     8:32:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPICallbackSynthesizor.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):102:126 -> a
     8:32:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
-    33:33:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
+    33:33:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
     33:33:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPICallbackSynthesizor.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):126 -> a
     33:33:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
     34:35:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPICallbackSynthesizor.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):130:131 -> a
     34:35:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
-    36:36:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
+    36:36:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
     36:36:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPICallbackSynthesizor.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):131 -> a
     36:36:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
     37:37:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPICallbackSynthesizor.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):134:134 -> a
@@ -82277,12 +82379,12 @@ com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPICallbackSynt
     92:92:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     92:92:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):157 -> a
     93:93:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):157:157 -> a
-    94:94:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
+    94:94:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
     94:94:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):157 -> a
     95:101:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPICallbackSynthesizor.shouldGenerateCallbacksForEmulateInterfaceAPIs(com.android.tools.r8.graph.DexClass):181:187 -> a
     95:101:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):160 -> a
     102:108:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):163:169 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter -> com.android.tools.r8.internal.VK0:
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter -> com.android.tools.r8.internal.YK0:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     java.util.Set trackedAPIs -> g
     com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter interfaceMethodRewriter -> d
@@ -82291,107 +82393,104 @@ com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter ->
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter backportedMethodRewriter -> c
     com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter retargeter -> e
     boolean $assertionsDisabled -> h
-    1:1:void <clinit>():64:64 -> <clinit>
-    1:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter,com.android.tools.r8.ir.desugar.BackportedMethodRewriter):84:96 -> <init>
-    1:4:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):109:112 -> a
-    5:7:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):356:358 -> a
-    5:7:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):111 -> a
-    8:11:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldOutlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):375:378 -> a
-    8:11:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):360 -> a
-    8:11:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):111 -> a
+    1:1:void <clinit>():63:63 -> <clinit>
+    1:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter,com.android.tools.r8.ir.desugar.BackportedMethodRewriter):83:95 -> <init>
+    1:4:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):108:111 -> a
+    5:7:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):341:343 -> a
+    5:7:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    8:11:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldOutlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):360:363 -> a
+    8:11:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):345 -> a
+    8:11:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):110 -> a
     12:12:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):285:285 -> a
-    12:12:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldOutlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):378 -> a
-    12:12:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):360 -> a
-    12:12:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):111 -> a
-    13:15:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldOutlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):382:384 -> a
-    13:15:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):360 -> a
-    13:15:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):111 -> a
-    16:17:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):362:363 -> a
-    16:17:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):111 -> a
-    18:33:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.rewriteLibraryInvokeToInlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):393:408 -> a
-    18:33:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):366 -> a
-    18:33:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):111 -> a
-    34:46:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.addInlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList):518:530 -> a
-    34:46:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.rewriteLibraryInvokeToInlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):416 -> a
-    34:46:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):366 -> a
-    34:46:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):111 -> a
-    47:52:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.rewriteLibraryInvokeToInlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):419:424 -> a
-    47:52:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):366 -> a
-    47:52:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):111 -> a
-    53:61:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):123:131 -> a
-    62:73:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean,com.android.tools.r8.graph.ProgramMethod):161:172 -> a
-    62:73:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):130 -> a
-    74:74:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    74:74:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean,com.android.tools.r8.graph.ProgramMethod):173 -> a
-    74:74:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):130 -> a
-    75:78:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.isEmulatedInterfaceOverride(com.android.tools.r8.graph.DexClassAndMethod):188:191 -> a
-    75:78:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean,com.android.tools.r8.graph.ProgramMethod):176 -> a
-    75:78:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):130 -> a
-    79:79:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> a
-    79:79:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.isEmulatedInterfaceOverride(com.android.tools.r8.graph.DexClassAndMethod):191 -> a
-    79:79:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean,com.android.tools.r8.graph.ProgramMethod):176 -> a
-    79:79:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):130 -> a
-    80:92:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.isEmulatedInterfaceOverride(com.android.tools.r8.graph.DexClassAndMethod):191:203 -> a
-    80:92:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean,com.android.tools.r8.graph.ProgramMethod):176 -> a
-    80:92:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):130 -> a
-    93:103:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.isAlreadyDesugared(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean,com.android.tools.r8.graph.ProgramMethod):211:221 -> a
-    93:103:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean,com.android.tools.r8.graph.ProgramMethod):179 -> a
-    93:103:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):130 -> a
-    104:104:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean,com.android.tools.r8.graph.ProgramMethod):182:182 -> a
-    104:104:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):130 -> a
-    105:106:boolean isAPIConversionSyntheticType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer,com.android.tools.r8.graph.AppView):136:137 -> a
-    107:107:com.android.tools.r8.graph.DexClassAndMethod getMethodForDesugaring(com.android.tools.r8.graph.DexMethod,boolean,boolean,com.android.tools.r8.graph.ProgramMethod):148:148 -> a
-    108:108:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):566:566 -> a
-    108:108:com.android.tools.r8.graph.DexClassAndMethod getMethodForDesugaring(com.android.tools.r8.graph.DexMethod,boolean,boolean,com.android.tools.r8.graph.ProgramMethod):148 -> a
-    109:109:com.android.tools.r8.graph.DexClassAndMethod getMethodForDesugaring(com.android.tools.r8.graph.DexMethod,boolean,boolean,com.android.tools.r8.graph.ProgramMethod):152:152 -> a
-    110:111:com.android.tools.r8.graph.DexClassAndMethod getMethodForDesugaring(com.android.tools.r8.graph.DexMethod,boolean,boolean,com.android.tools.r8.graph.ProgramMethod):150:151 -> a
-    112:113:com.android.tools.r8.graph.MethodResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):613:614 -> a
-    112:113:com.android.tools.r8.graph.DexClassAndMethod getMethodForDesugaring(com.android.tools.r8.graph.DexMethod,boolean,boolean,com.android.tools.r8.graph.ProgramMethod):151 -> a
-    114:114:com.android.tools.r8.graph.DexClassAndMethod getMethodForDesugaring(com.android.tools.r8.graph.DexMethod,boolean,boolean,com.android.tools.r8.graph.ProgramMethod):152:152 -> a
-    115:129: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):229:243 -> a
-    130:140:void generateTrackDesugaredAPIWarnings(java.util.Set,java.lang.String,com.android.tools.r8.graph.AppView):251:261 -> a
-    141:143:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):267:269 -> a
-    144:146:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):268:270 -> a
-    147:160:com.android.tools.r8.graph.DexMethod getConvertedAPI(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.AppView):300:313 -> a
-    161:166:com.android.tools.r8.graph.DexMethod getConvertedAPI(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.AppView):311:316 -> a
-    167:176:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.invalidType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.AppView):279:288 -> a
-    167:176:com.android.tools.r8.graph.DexMethod getConvertedAPI(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.AppView):317 -> a
-    177:177:com.android.tools.r8.graph.DexMethod getConvertedAPI(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.AppView):315:315 -> a
-    178:185:com.android.tools.r8.graph.DexMethod[] computeParameterConversions(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):336:343 -> a
-    186:191:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):439:444 -> a
-    192:192:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():77:77 -> a
-    192:192:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):444 -> a
-    193:193:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):444:444 -> a
-    194:201:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):443:450 -> a
-    202:216:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):448:462 -> a
-    217:236:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):461:480 -> a
-    237:239:void lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.synthesis.SyntheticMethodBuilder):454:456 -> a
-    240:240:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):458:458 -> a
-    241:265:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):485:509 -> a
-    241:265:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):458 -> a
-    266:266:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():77:77 -> a
-    266:266:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):511 -> a
-    266:266:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):458 -> a
-    267:267:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):511:511 -> a
-    267:267:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):458 -> a
-    268:268:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():77:77 -> a
-    268:268:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):512 -> a
-    268:268:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):458 -> a
-    269:269:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):512:512 -> a
-    269:269:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):458 -> a
-    270:271:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List):159:160 -> a
-    270:271:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):512 -> a
-    270:271:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):458 -> a
-    272:272:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List):154:154 -> a
-    272:272:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):512 -> a
-    272:272:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):458 -> a
-    273:285:com.android.tools.r8.graph.DexMethod createOutlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):538:550 -> a
-    286:304:com.android.tools.r8.graph.DexMethod createOutlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):548:566 -> a
-    305:307:void lambda$createOutlinedAPIConversion$3(com.android.tools.r8.graph.DexProto,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.synthesis.SyntheticMethodBuilder):554:556 -> a
-    308:314:com.android.tools.r8.graph.Code lambda$createOutlinedAPIConversion$2(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):558:564 -> a
-    1:1:void generateTrackingWarnings():246:246 -> b
-    2:5:com.android.tools.r8.graph.DexMethod computeReturnConversion(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):324:327 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration -> com.android.tools.r8.internal.XK0:
+    12:12:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldOutlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):363 -> a
+    12:12:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):345 -> a
+    12:12:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    13:15:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldOutlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):366:368 -> a
+    13:15:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):345 -> a
+    13:15:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    16:17:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):347:348 -> a
+    16:17:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    18:33:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.rewriteLibraryInvokeToInlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):377:392 -> a
+    18:33:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):351 -> a
+    18:33:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    34:46:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.addInlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList):502:514 -> a
+    34:46:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.rewriteLibraryInvokeToInlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):400 -> a
+    34:46:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):351 -> a
+    34:46:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    47:52:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.rewriteLibraryInvokeToInlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):403:408 -> a
+    47:52:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):351 -> a
+    47:52:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    53:59:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):122:128 -> a
+    60:69:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):154:163 -> a
+    60:69:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):128 -> a
+    70:70:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    70:70:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):164 -> a
+    70:70:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):128 -> a
+    71:74:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.isEmulatedInterfaceOverride(com.android.tools.r8.graph.DexClassAndMethod):179:182 -> a
+    71:74:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):167 -> a
+    71:74:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):128 -> a
+    75:75:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> a
+    75:75:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.isEmulatedInterfaceOverride(com.android.tools.r8.graph.DexClassAndMethod):182 -> a
+    75:75:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):167 -> a
+    75:75:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):128 -> a
+    76:88:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.isEmulatedInterfaceOverride(com.android.tools.r8.graph.DexClassAndMethod):182:194 -> a
+    76:88:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):167 -> a
+    76:88:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):128 -> a
+    89:97:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.isAlreadyDesugared(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):198:206 -> a
+    89:97:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):170 -> a
+    89:97:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):128 -> a
+    98:98:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):173:173 -> a
+    98:98:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):128 -> a
+    99:100:boolean isAPIConversionSyntheticType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer,com.android.tools.r8.graph.AppView):133:134 -> a
+    101:104:com.android.tools.r8.graph.DexClassAndMethod getMethodForDesugaring(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):142:145 -> a
+    105:105:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):566:566 -> a
+    105:105:com.android.tools.r8.graph.DexClassAndMethod getMethodForDesugaring(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):145 -> a
+    106:106:com.android.tools.r8.graph.DexClassAndMethod getMethodForDesugaring(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):149:149 -> a
+    107:109:com.android.tools.r8.graph.DexClassAndMethod getMethodForDesugaring(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):147:149 -> a
+    110:124: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):214:228 -> a
+    125:135:void generateTrackDesugaredAPIWarnings(java.util.Set,java.lang.String,com.android.tools.r8.graph.AppView):236:246 -> a
+    136:138:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):252:254 -> a
+    139:141:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):253:255 -> a
+    142:155:com.android.tools.r8.graph.DexMethod getConvertedAPI(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.AppView):285:298 -> a
+    156:161:com.android.tools.r8.graph.DexMethod getConvertedAPI(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.AppView):296:301 -> a
+    162:171:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.invalidType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.AppView):264:273 -> a
+    162:171:com.android.tools.r8.graph.DexMethod getConvertedAPI(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.AppView):302 -> a
+    172:172:com.android.tools.r8.graph.DexMethod getConvertedAPI(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.AppView):300:300 -> a
+    173:180:com.android.tools.r8.graph.DexMethod[] computeParameterConversions(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):321:328 -> a
+    181:186:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):423:428 -> a
+    187:187:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():77:77 -> a
+    187:187:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):428 -> a
+    188:188:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):428:428 -> a
+    189:196:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):427:434 -> a
+    197:211:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):432:446 -> a
+    212:231:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):445:464 -> a
+    232:234:void lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.synthesis.SyntheticMethodBuilder):438:440 -> a
+    235:235:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):442:442 -> a
+    236:260:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):469:493 -> a
+    236:260:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):442 -> a
+    261:261:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():77:77 -> a
+    261:261:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):495 -> a
+    261:261:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):442 -> a
+    262:262:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):495:495 -> a
+    262:262:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):442 -> a
+    263:263:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():77:77 -> a
+    263:263:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):496 -> a
+    263:263:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):442 -> a
+    264:264:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):496:496 -> a
+    264:264:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):442 -> a
+    265:266:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List):159:160 -> a
+    265:266:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):496 -> a
+    265:266:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):442 -> a
+    267:267:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List):154:154 -> a
+    267:267:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):496 -> a
+    267:267:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):442 -> a
+    268:280:com.android.tools.r8.graph.DexMethod createOutlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):522:534 -> a
+    281:299:com.android.tools.r8.graph.DexMethod createOutlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):532:550 -> a
+    300:302:void lambda$createOutlinedAPIConversion$3(com.android.tools.r8.graph.DexProto,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.synthesis.SyntheticMethodBuilder):538:540 -> a
+    303:309:com.android.tools.r8.graph.Code lambda$createOutlinedAPIConversion$2(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):542:548 -> a
+    1:1:void generateTrackingWarnings():231:231 -> b
+    2:5:com.android.tools.r8.graph.DexMethod computeReturnConversion(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):309:312 -> b
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration -> com.android.tools.r8.internal.aL0:
     com.android.tools.r8.utils.AndroidApiLevel requiredCompilationAPILevel -> a
     java.util.Map retargetCoreLibMember -> i
     boolean supportAllCallbacksFromLibrary -> f
@@ -82442,10 +82541,10 @@ com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration -
     2:2:boolean hasEmulatedLibraryInterfaces():187:187 -> o
     boolean isEmptyConfiguration() -> p
     1:1:boolean isLibraryCompilation():160:160 -> q
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$1 -> com.android.tools.r8.internal.WK0:
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$1 -> com.android.tools.r8.internal.ZK0:
     1:1:void <init>(com.android.tools.r8.utils.AndroidApiLevel,boolean,java.lang.String,java.lang.String,java.lang.String,boolean,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.List,java.util.List,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):104:104 -> <init>
     boolean isSupported(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView) -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder -> com.android.tools.r8.internal.XK0$a:
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder -> com.android.tools.r8.internal.aL0$a:
     java.lang.String identifier -> g
     java.lang.String synthesizedLibraryClassesPackagePrefix -> f
     java.util.List extraKeepRules -> p
@@ -82518,7 +82617,7 @@ com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$B
     5:5:int sharpIndex(java.lang.String,java.lang.String):401 -> f
     6:6:int sharpIndex(java.lang.String,java.lang.String):401:401 -> f
     7:7:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):408:408 -> f
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfigurationParser -> com.android.tools.r8.internal.YK0:
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfigurationParser -> com.android.tools.r8.internal.bL0:
     com.android.tools.r8.utils.SemanticVersion MIN_SUPPORTED_VERSION -> g
     com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder configurationBuilder -> e
     com.android.tools.r8.origin.Origin origin -> f
@@ -82552,7 +82651,7 @@ com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfigurationPa
     124:138:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):174 -> a
     139:151:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfigurationParser.parseFlags(com.android.tools.r8.com.google.gson.JsonObject):210:222 -> a
     139:151:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):174 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter -> com.android.tools.r8.internal.dL0:
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter -> com.android.tools.r8.internal.gL0:
     com.android.tools.r8.utils.collections.DexClassAndMethodSet emulatedDispatchMethods -> f
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map retargetLibraryMember -> d
@@ -82560,89 +82659,88 @@ com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter -> c
     com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSyntheticHelper syntheticHelper -> b
     boolean $assertionsDisabled -> g
     java.util.Map nonFinalHolderRewrites -> e
-    1:1:void <clinit>():41:41 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.graph.AppView):51:57 -> <init>
-    1:1:void visit(java.util.function.Consumer):62:62 -> a
-    2:10:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):78:86 -> a
-    11:11:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):85:85 -> a
-    12:12:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):91:91 -> a
-    13:20:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter.computeRetargetedMethod(com.android.tools.r8.graph.DexMethod,boolean):196:203 -> a
-    13:20:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.graph.DexMethod,boolean,boolean,com.android.tools.r8.graph.ProgramMethod):178 -> a
-    21:22:com.android.tools.r8.graph.MethodResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):613:614 -> a
-    21:22:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter.computeRetargetedMethod(com.android.tools.r8.graph.DexMethod,boolean):203 -> a
-    21:22:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.graph.DexMethod,boolean,boolean,com.android.tools.r8.graph.ProgramMethod):178 -> a
-    23:28:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter.computeRetargetedMethod(com.android.tools.r8.graph.DexMethod,boolean):204:209 -> a
-    23:28:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.graph.DexMethod,boolean,boolean,com.android.tools.r8.graph.ProgramMethod):178 -> a
-    29:34:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.graph.DexMethod,boolean,boolean,com.android.tools.r8.graph.ProgramMethod):179:184 -> a
-    35:35:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):566:566 -> a
-    35:35:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.graph.DexMethod,boolean,boolean,com.android.tools.r8.graph.ProgramMethod):184 -> a
-    36:38:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.graph.DexMethod,boolean,boolean,com.android.tools.r8.graph.ProgramMethod):186:188 -> a
-    39:39:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.graph.DexMethod,boolean,boolean,com.android.tools.r8.graph.ProgramMethod):187:187 -> a
-    40:53:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeRetargetLibraryMember(com.android.tools.r8.graph.DexMethod):215:228 -> a
-    54:58:com.android.tools.r8.graph.DexMethod lambda$computeRetargetLibraryMember$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):221:225 -> a
-    59:61:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):245:247 -> a
-    59:61:com.android.tools.r8.graph.DexMethod lambda$computeRetargetLibraryMember$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):224 -> a
-    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo getRetargetingInfo():66:66 -> b
-    2:3:boolean hasNewInvokeTarget(com.android.tools.r8.graph.DexMethod,boolean,boolean,com.android.tools.r8.graph.ProgramMethod):159:160 -> b
-    4:11:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):165:172 -> b
-    12:12:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):169:169 -> b
-    13:13:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):166:166 -> b
-    14:19:boolean matchesNonFinalHolderRewrite(com.android.tools.r8.graph.DexMethod):232:237 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$1 -> com.android.tools.r8.internal.bL0:
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult -> com.android.tools.r8.internal.cL0:
+    1:1:void <clinit>():36:36 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.graph.AppView):46:52 -> <init>
+    1:1:void visit(java.util.function.Consumer):57:57 -> a
+    2:10:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):73:81 -> a
+    11:11:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):80:80 -> a
+    12:12:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):86:86 -> a
+    13:26:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeRetargetLibraryMember(com.android.tools.r8.graph.DexMethod):170:183 -> a
+    27:31:com.android.tools.r8.graph.DexMethod lambda$computeRetargetLibraryMember$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):176:180 -> a
+    32:34:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):200:202 -> a
+    32:34:com.android.tools.r8.graph.DexMethod lambda$computeRetargetLibraryMember$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):179 -> a
+    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo getRetargetingInfo():61:61 -> b
+    2:8:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):126:132 -> b
+    9:16:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter.computeRetargetedMethod(com.android.tools.r8.graph.DexMethod,boolean):151:158 -> b
+    9:16:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):132 -> b
+    17:18:com.android.tools.r8.graph.MethodResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):613:614 -> b
+    17:18:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter.computeRetargetedMethod(com.android.tools.r8.graph.DexMethod,boolean):158 -> b
+    17:18:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):132 -> b
+    19:24:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter.computeRetargetedMethod(com.android.tools.r8.graph.DexMethod,boolean):159:164 -> b
+    19:24:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):132 -> b
+    25:31:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):133:139 -> b
+    32:32:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):566:566 -> b
+    32:32:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):139 -> b
+    33:35:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):141:143 -> b
+    36:36:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):142:142 -> b
+    37:37:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):127:127 -> b
+    38:43:boolean matchesNonFinalHolderRewrite(com.android.tools.r8.graph.DexMethod):187:192 -> b
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$1 -> com.android.tools.r8.internal.eL0:
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult -> com.android.tools.r8.internal.fL0:
     com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult NO_REWRITING -> c
     boolean hasNewInvokeTarget -> a
     java.util.function.Function newInvokeTargetSupplier -> b
     boolean $assertionsDisabled -> d
-    1:3:void <clinit>():122:124 -> <clinit>
-    1:1:void <init>(boolean,java.util.function.Function,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$1):122:122 -> <init>
-    2:4:void <init>(boolean,java.util.function.Function):141:143 -> <init>
+    1:3:void <clinit>():89:91 -> <clinit>
+    1:1:void <init>(boolean,java.util.function.Function,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$1):89:89 -> <init>
+    2:4:void <init>(boolean,java.util.function.Function):108:110 -> <init>
     com.android.tools.r8.graph.DexMethod lambda$createInvokeRetargetingResult$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer) -> a
-    1:3:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult createInvokeRetargetingResult(com.android.tools.r8.graph.DexMethod):133:135 -> a
-    4:4:boolean hasNewInvokeTarget():147:147 -> a
-    5:5:com.android.tools.r8.graph.DexMethod getNewInvokeTarget(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):152:152 -> a
-    6:6:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult.hasNewInvokeTarget():147:147 -> a
-    6:6:com.android.tools.r8.graph.DexMethod getNewInvokeTarget(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):152 -> a
-    7:8:com.android.tools.r8.graph.DexMethod getNewInvokeTarget(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):152:153 -> a
+    1:3:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult createInvokeRetargetingResult(com.android.tools.r8.graph.DexMethod):100:102 -> a
+    4:4:boolean hasNewInvokeTarget():114:114 -> a
+    5:5:com.android.tools.r8.graph.DexMethod getNewInvokeTarget(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):119:119 -> a
+    6:6:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult.hasNewInvokeTarget():114:114 -> a
+    6:6:com.android.tools.r8.graph.DexMethod getNewInvokeTarget(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):119 -> a
+    7:8:com.android.tools.r8.graph.DexMethod getNewInvokeTarget(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):119:120 -> a
     com.android.tools.r8.graph.DexMethod lambda$static$0(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer) -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterL8Synthesizer -> com.android.tools.r8.internal.eL0:
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterL8Synthesizer -> com.android.tools.r8.internal.hL0:
     com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSyntheticHelper syntheticHelper -> a
     com.android.tools.r8.utils.collections.DexClassAndMethodSet emulatedDispatchMethods -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():12:12 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):29:32 -> <init>
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):20:20 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
     2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):20 -> a
     3:8:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):20:25 -> a
     9:9:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):22:22 -> a
     10:12:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):37:39 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterLibraryTypeSynthesizor -> com.android.tools.r8.internal.fL0:
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterLibraryTypeSynthesizor -> com.android.tools.r8.internal.iL0:
     com.android.tools.r8.graph.DexApplication lambda$amendLibraryWithRetargetedMembers$0(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexApplication) -> a
-    1:16:void amendLibraryWithRetargetedMembers(com.android.tools.r8.graph.AppView):58:73 -> a
-    17:22:java.util.Map synthesizeLibraryClassesForRetargetedMembers(com.android.tools.r8.graph.AppView,java.util.Map):79:84 -> a
-    23:33:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):90:100 -> a
+    1:16:void amendLibraryWithRetargetedMembers(com.android.tools.r8.graph.AppView):56:71 -> a
+    17:22:java.util.Map synthesizeLibraryClassesForRetargetedMembers(com.android.tools.r8.graph.AppView,java.util.Map):77:82 -> a
+    23:33:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):88:98 -> a
     34:34:java.util.List com.android.tools.r8.graph.NestMemberClassAttribute.emptyList():28:28 -> a
-    34:34:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):100 -> a
-    35:36:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):101:102 -> a
+    34:34:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):98 -> a
+    35:36:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):99:100 -> a
     37:37:java.util.List com.android.tools.r8.graph.InnerClassAttribute.emptyList():45:45 -> a
-    37:37:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):102 -> a
-    38:44:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):103:109 -> a
-    45:50:java.util.Map synthesizedMembersForRetargetClasses(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map):120:125 -> a
-    51:58:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):127:134 -> a
+    37:37:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):100 -> a
+    38:44:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):101:107 -> a
+    45:50:java.util.Map synthesizedMembersForRetargetClasses(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map):118:123 -> a
+    51:58:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):125:132 -> a
     59:59:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):302:302 -> a
-    59:59:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):134 -> a
-    60:60:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):135:135 -> a
+    59:59:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):132 -> a
+    60:60:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):133:133 -> a
     61:63:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withExtraArgumentPrepended(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):293:293 -> a
-    61:63:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):136 -> a
-    64:75:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):138:149 -> a
-    76:76:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):142:142 -> a
-    77:77:boolean lambda$synthesizedMembersForRetargetClasses$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):133:133 -> a
-    78:78:java.util.Set lambda$synthesizedMembersForRetargetClasses$3(com.android.tools.r8.graph.DexLibraryClass):141:141 -> a
-    1:4:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):45:48 -> b
-    5:10:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterLibraryTypeSynthesizor.warnMissingRetargetCoreLibraryMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):159:164 -> b
-    5:10:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):50 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor -> com.android.tools.r8.internal.gL0:
+    61:63:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):134 -> a
+    64:72:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):136:144 -> a
+    73:77:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):143:147 -> a
+    78:78:void lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):140:140 -> a
+    79:79:boolean lambda$synthesizedMembersForRetargetClasses$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):131:131 -> a
+    80:80:java.util.Set lambda$synthesizedMembersForRetargetClasses$3(com.android.tools.r8.graph.DexLibraryClass):139:139 -> a
+    1:4:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):43:46 -> b
+    5:10:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterLibraryTypeSynthesizor.warnMissingRetargetCoreLibraryMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):155:160 -> b
+    5:10:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):48 -> b
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor -> com.android.tools.r8.internal.jL0:
     com.android.tools.r8.utils.collections.DexClassAndMethodSet emulatedDispatchMethods -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSyntheticHelper syntheticHelper -> b
@@ -82650,11 +82748,11 @@ com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostP
     1:1:void <clinit>():33:33 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):40:43 -> <init>
     1:1:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):52:52 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
     2:2:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):52 -> a
     3:4:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):52:53 -> a
     5:5:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59:59 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
     6:6:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59 -> a
     7:7:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59:59 -> a
     8:8:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
@@ -82706,15 +82804,15 @@ com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostP
     73:75:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):79 -> a
     76:77:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.ensureInterfacesAndForwardingMethodsSynthesized(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,java.util.List):129:130 -> a
     76:77:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):79 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer -> com.android.tools.r8.internal.hL0:
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer -> com.android.tools.r8.internal.kL0:
     void acceptDesugaredLibraryRetargeterDispatchClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSyntheticHelper -> com.android.tools.r8.internal.iL0:
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSyntheticHelper -> com.android.tools.r8.internal.lL0:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():22:22 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):26:27 -> <init>
     1:2:com.android.tools.r8.graph.DexClass ensureEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):33:34 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
     3:3:com.android.tools.r8.graph.DexClass ensureEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):34 -> a
     4:7:com.android.tools.r8.graph.DexClass ensureEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):35:38 -> a
     8:20:com.android.tools.r8.graph.DexClass ensureEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):37:49 -> a
@@ -82723,7 +82821,7 @@ com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynth
     24:24:void lambda$ensureProgramEmulatedHolderDispatchMethod$2(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):77:77 -> a
     25:25:void lambda$ensureEmulatedInterfaceDispatchMethod$4(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):103:103 -> a
     26:26:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):113:113 -> a
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
     27:27:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):113 -> a
     28:34:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):113:119 -> a
     35:35:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):117:117 -> a
@@ -82740,192 +82838,189 @@ com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynth
     53:53:void lambda$buildHolderDispatchMethod$10(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):157 -> a
     54:57:void lambda$buildHolderDispatchMethod$10(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):157:160 -> a
     58:58:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$9(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):162:162 -> a
-    59:59:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
+    59:59:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
     59:59:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$9(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):162 -> a
     60:60:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$9(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):170:170 -> a
     61:67:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$9(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):164:170 -> a
     68:72:void rewriteType(com.android.tools.r8.graph.DexType):176:180 -> a
     1:2:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):64:65 -> b
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> b
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> b
     3:3:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):65 -> b
     4:13:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):65:74 -> b
     14:14:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):72:72 -> b
     15:16:void lambda$ensureProgramEmulatedHolderDispatchMethod$3(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer,com.android.tools.r8.graph.DexProgramClass):79:80 -> b
     17:18:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):87:88 -> b
-    19:19:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> b
+    19:19:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> b
     19:19:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):88 -> b
     20:23:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):89:92 -> b
     24:32:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):91:99 -> b
     33:34:void lambda$ensureEmulatedInterfaceDispatchMethod$5(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.graph.DexClasspathClass):105:106 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.internal.kL0:
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.internal.nL0:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.concurrent.ConcurrentHashMap allImplementedMethodsCache -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():96:96 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):103:103 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.AppView):100:105 -> <init>
+    1:1:void <clinit>():92:92 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):99:99 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView):96:101 -> <init>
     com.android.tools.r8.graph.Code lambda$buildConversionMethod$7(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod) -> a
     void lambda$getExistingProgramConversionMethod$5(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder) -> a
-    1:1:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):114:114 -> a
+    1:1:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):110:110 -> a
     2:2:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):34:34 -> a
-    2:2:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):114 -> a
-    3:3:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.canConvert(com.android.tools.r8.graph.DexType):174:174 -> a
-    3:3:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):117 -> a
-    4:4:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.canGenerateWrapper(com.android.tools.r8.graph.DexType):197:197 -> a
-    4:4:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.canConvert(com.android.tools.r8.graph.DexType):175 -> a
-    4:4:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):117 -> a
-    5:15:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):179:189 -> a
-    5:15:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):120 -> a
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
-    16:16:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):189 -> a
-    16:16:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):120 -> a
-    17:17:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):192:192 -> a
-    17:17:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):120 -> a
-    18:18:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):190:190 -> a
-    18:18:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):120 -> a
-    19:23:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):129:133 -> a
-    24:24:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.canGenerateWrapper(com.android.tools.r8.graph.DexType):197:197 -> a
-    24:24:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):133 -> a
-    25:33:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):133:141 -> a
-    34:38:com.android.tools.r8.graph.DexMethod getCustomConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):164:168 -> a
-    39:39:com.android.tools.r8.graph.DexMethod getCustomConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):167:167 -> a
-    40:43:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):201:204 -> a
+    2:2:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):110 -> a
+    3:3:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.canConvert(com.android.tools.r8.graph.DexType):170:170 -> a
+    3:3:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):113 -> a
+    4:4:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.canGenerateWrapper(com.android.tools.r8.graph.DexType):193:193 -> a
+    4:4:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.canConvert(com.android.tools.r8.graph.DexType):171 -> a
+    4:4:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):113 -> a
+    5:15:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):175:185 -> a
+    5:15:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):116 -> a
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
+    16:16:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):185 -> a
+    16:16:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):116 -> a
+    17:17:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):188:188 -> a
+    17:17:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):116 -> a
+    18:18:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):186:186 -> a
+    18:18:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):116 -> a
+    19:23:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):125:129 -> a
+    24:24:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.canGenerateWrapper(com.android.tools.r8.graph.DexType):193:193 -> a
+    24:24:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):129 -> a
+    25:33:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):129:137 -> a
+    34:38:com.android.tools.r8.graph.DexMethod getCustomConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):160:164 -> a
+    39:39:com.android.tools.r8.graph.DexMethod getCustomConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):163:163 -> a
+    40:43:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):197:200 -> a
     44:44:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    44:44:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):204 -> a
-    45:45:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):204:204 -> a
-    46:46:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
-    46:46:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):204 -> a
-    47:48:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):204:205 -> a
-    49:55:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):234:240 -> a
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):210:210 -> a
-    56:56:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):241 -> a
-    57:75:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):242:260 -> a
-    76:76:java.util.Collection lambda$ensureWrappers$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):249:249 -> a
-    77:79:com.android.tools.r8.graph.DexMethod getConversion(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):281:283 -> a
-    80:82:com.android.tools.r8.graph.DexMethod getConversion(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):282:284 -> a
-    83:83:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.getWrapperUniqueField(com.android.tools.r8.graph.DexClass):293:293 -> a
-    83:83:void getExistingProgramConversionMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):345 -> a
-    84:84:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.getWrapperUniqueField(com.android.tools.r8.graph.DexClass):293:293 -> a
-    84:84:void getExistingProgramConversionMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):346 -> a
-    85:88:void getExistingProgramConversionMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):347:350 -> a
-    89:89:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):302:302 -> a
-    90:90:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
-    90:90:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):302 -> a
-    91:95:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):302:306 -> a
-    96:96:void lambda$ensureProgramWrapper$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):310:310 -> a
-    97:100:com.android.tools.r8.graph.DexClasspathClass ensureClasspathWrapper(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,java.util.function.Function):323:326 -> a
-    101:101:void lambda$ensureClasspathWrapper$4(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryClass,java.util.function.Function,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):333:333 -> a
-    102:108:void lambda$ensureClasspathWrapper$4(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryClass,java.util.function.Function,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):332:338 -> a
-    109:111:void lambda$ensureClasspathWrapper$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):336:336 -> a
-    112:125:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.computeProgramConversionMethodCode(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass):371:384 -> a
-    112:125:void lambda$getExistingProgramConversionMethod$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):361 -> a
-    126:126:void lambda$getExistingProgramConversionMethod$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):358:358 -> a
-    127:131:void buildConversionMethod(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.CfCode):389:393 -> a
-    132:135:void buildConversionMethod(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.CfCode):392:395 -> a
-    136:141:com.android.tools.r8.graph.DexEncodedField buildWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticClassBuilder):403:408 -> a
-    142:142:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.wrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):619:619 -> a
-    142:142:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):623 -> a
-    142:142:com.android.tools.r8.graph.DexEncodedField buildWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticClassBuilder):408 -> a
-    143:145:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):626:628 -> a
-    143:145:com.android.tools.r8.graph.DexEncodedField buildWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticClassBuilder):408 -> a
-    146:146:void com.android.tools.r8.graph.DexEncodedField.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):69:69 -> a
-    146:146:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):628 -> a
-    146:146:com.android.tools.r8.graph.DexEncodedField buildWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticClassBuilder):408 -> a
-    147:150:com.android.tools.r8.graph.DexEncodedField buildWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticClassBuilder):410:413 -> a
-    151:155:void buildWrapperConstructor(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.synthesis.SyntheticMethodBuilder):419:423 -> a
-    156:159:void buildWrapperConstructor(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.synthesis.SyntheticMethodBuilder):422:425 -> a
-    160:161:com.android.tools.r8.graph.Code lambda$buildWrapperConstructor$9(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexMethod):427:428 -> a
-    162:162:java.lang.String lambda$reportFinalMethodsInWrapper$10(com.android.tools.r8.graph.DexMethod):539:539 -> a
-    163:163:java.lang.String[] lambda$reportFinalMethodsInWrapper$11(int):539:539 -> a
-    164:173:void reportFinalMethodsInWrapper(java.util.Set):539:548 -> a
-    174:174:void reportFinalMethodsInWrapper(java.util.Set):543:543 -> a
-    175:190: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):554:569 -> a
-    191:191:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):575:575 -> a
-    192:216:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):580:604 -> a
-    192:216:java.util.List lambda$allImplementedMethods$12(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):576 -> a
-    217:217:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
-    217:217:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):604 -> a
-    217:217:java.util.List lambda$allImplementedMethods$12(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):576 -> a
-    218:226:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):604:612 -> a
-    218:226:java.util.List lambda$allImplementedMethods$12(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):576 -> a
-    227:235:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):637:645 -> a
-    236:239:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):658:661 -> a
-    236:239:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):646 -> a
-    240:240:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
-    240:240:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):661 -> a
-    240:240:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):646 -> a
-    241:243:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):661:663 -> a
-    241:243:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):646 -> a
-    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):210:210 -> a
-    244:244:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):665 -> a
-    244:244:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):646 -> a
-    245:247:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):664:666 -> a
-    245:247:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):646 -> a
-    248:248:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):210:210 -> a
-    248:248:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):670 -> a
-    248:248:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):646 -> a
-    249:257:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):667:675 -> a
-    249:257:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):646 -> a
-    258:258:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):649:649 -> a
-    259:260:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):680:681 -> a
-    259:260:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):650 -> a
-    261:261:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):277:277 -> a
-    261:261:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):681 -> a
-    261:261:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):650 -> a
-    262:262:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):683:683 -> a
-    262:262:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):650 -> a
-    263:265:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):682:684 -> a
-    263:265:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):650 -> a
-    266:266:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):277:277 -> a
-    266:266:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):685 -> a
-    266:266:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):650 -> a
-    267:267:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):688:688 -> a
-    267:267:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):650 -> a
-    268:268:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):687:687 -> a
-    268:268:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):650 -> a
-    269:269:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):686:686 -> a
-    269:269:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):650 -> a
-    1:2:boolean isSyntheticWrapper(com.android.tools.r8.graph.DexType):109:110 -> b
-    3:13:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):147:157 -> b
-    14:14:java.util.Collection lambda$ensureWrappers$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):257:257 -> b
-    15:15:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):266:266 -> b
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> b
-    16:16:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):266 -> b
-    17:18:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):266:267 -> b
-    19:19:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):277:277 -> b
-    19:19:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):267 -> b
-    20:20:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):268:268 -> b
-    21:21:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):277:277 -> b
-    21:21:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):268 -> b
-    22:26:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):269:273 -> b
-    27:27:void lambda$buildWrapper$8(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.synthesis.SyntheticMethodBuilder):413:413 -> b
-    1:2:com.android.tools.r8.graph.DexEncodedField getWrapperUniqueEncodedField(com.android.tools.r8.graph.DexClass):288:289 -> c
-    3:18:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):484:499 -> c
-    19:19:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> c
-    19:19:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):499 -> c
-    20:24:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):499:503 -> c
-    25:45:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):502:522 -> c
-    46:51:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.finalizeWrapperMethods(java.util.List,java.util.Set):529:534 -> c
-    46:51:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):524 -> c
-    1:1:com.android.tools.r8.graph.DexField getWrapperUniqueField(com.android.tools.r8.graph.DexClass):293:293 -> d
-    2:22:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):433:453 -> d
-    23:36:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):449:462 -> d
-    37:55:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):459:477 -> d
-    56:61:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.finalizeWrapperMethods(java.util.List,java.util.Set):529:534 -> d
-    56:61:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):479 -> d
-    1:1:boolean isInvalidWrapper(com.android.tools.r8.graph.DexClass):366:366 -> e
+    44:44:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):200 -> a
+    45:45:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):200:200 -> a
+    46:46:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
+    46:46:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):200 -> a
+    47:48:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):200:201 -> a
+    49:55:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):230:236 -> a
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):206:206 -> a
+    56:56:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):237 -> a
+    57:75:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):238:256 -> a
+    76:76:java.util.Collection lambda$ensureWrappers$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):245:245 -> a
+    77:79:com.android.tools.r8.graph.DexMethod getConversion(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):277:279 -> a
+    80:82:com.android.tools.r8.graph.DexMethod getConversion(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):278:280 -> a
+    83:83:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.getWrapperUniqueField(com.android.tools.r8.graph.DexClass):289:289 -> a
+    83:83:void getExistingProgramConversionMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):341 -> a
+    84:84:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.getWrapperUniqueField(com.android.tools.r8.graph.DexClass):289:289 -> a
+    84:84:void getExistingProgramConversionMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):342 -> a
+    85:88:void getExistingProgramConversionMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):343:346 -> a
+    89:89:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):298:298 -> a
+    90:90:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
+    90:90:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):298 -> a
+    91:95:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):298:302 -> a
+    96:96:void lambda$ensureProgramWrapper$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):306:306 -> a
+    97:100:com.android.tools.r8.graph.DexClasspathClass ensureClasspathWrapper(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,java.util.function.Function):319:322 -> a
+    101:101:void lambda$ensureClasspathWrapper$4(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryClass,java.util.function.Function,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):329:329 -> a
+    102:108:void lambda$ensureClasspathWrapper$4(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryClass,java.util.function.Function,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):328:334 -> a
+    109:111:void lambda$ensureClasspathWrapper$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):332:332 -> a
+    112:125:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.computeProgramConversionMethodCode(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass):367:380 -> a
+    112:125:void lambda$getExistingProgramConversionMethod$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):357 -> a
+    126:126:void lambda$getExistingProgramConversionMethod$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):354:354 -> a
+    127:131:void buildConversionMethod(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.CfCode):385:389 -> a
+    132:135:void buildConversionMethod(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.CfCode):388:391 -> a
+    136:141:com.android.tools.r8.graph.DexEncodedField buildWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticClassBuilder):399:404 -> a
+    142:142:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.wrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):612:612 -> a
+    142:142:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):616 -> a
+    142:142:com.android.tools.r8.graph.DexEncodedField buildWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticClassBuilder):404 -> a
+    143:147:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):619:623 -> a
+    143:147:com.android.tools.r8.graph.DexEncodedField buildWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticClassBuilder):404 -> a
+    148:151:com.android.tools.r8.graph.DexEncodedField buildWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticClassBuilder):406:409 -> a
+    152:156:void buildWrapperConstructor(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.synthesis.SyntheticMethodBuilder):415:419 -> a
+    157:160:void buildWrapperConstructor(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.synthesis.SyntheticMethodBuilder):418:421 -> a
+    161:162:com.android.tools.r8.graph.Code lambda$buildWrapperConstructor$9(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexMethod):423:424 -> a
+    163:163:java.lang.String lambda$reportFinalMethodsInWrapper$10(com.android.tools.r8.graph.DexMethod):535:535 -> a
+    164:164:java.lang.String[] lambda$reportFinalMethodsInWrapper$11(int):535:535 -> a
+    165:174:void reportFinalMethodsInWrapper(java.util.Set):535:544 -> a
+    175:175:void reportFinalMethodsInWrapper(java.util.Set):539:539 -> a
+    176:190: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):550:564 -> a
+    191:191:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):568:568 -> a
+    192:216:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):573:597 -> a
+    192:216:java.util.List lambda$allImplementedMethods$12(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):569 -> a
+    217:217:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
+    217:217:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):597 -> a
+    217:217:java.util.List lambda$allImplementedMethods$12(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):569 -> a
+    218:226:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):597:605 -> a
+    218:226:java.util.List lambda$allImplementedMethods$12(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):569 -> a
+    227:235:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):632:640 -> a
+    236:239:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):653:656 -> a
+    236:239:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):641 -> a
+    240:240:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
+    240:240:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):656 -> a
+    240:240:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):641 -> a
+    241:243:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):656:658 -> a
+    241:243:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):641 -> a
+    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):206:206 -> a
+    244:244:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):660 -> a
+    244:244:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):641 -> a
+    245:247:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):659:661 -> a
+    245:247:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):641 -> a
+    248:248:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):206:206 -> a
+    248:248:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):665 -> a
+    248:248:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):641 -> a
+    249:257:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):662:670 -> a
+    249:257:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):641 -> a
+    258:258:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):644:644 -> a
+    259:260:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):675:676 -> a
+    259:260:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):645 -> a
+    261:261:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):273:273 -> a
+    261:261:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):676 -> a
+    261:261:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):645 -> a
+    262:262:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):678:678 -> a
+    262:262:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):645 -> a
+    263:265:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):677:679 -> a
+    263:265:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):645 -> a
+    266:266:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):273:273 -> a
+    266:266:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):680 -> a
+    266:266:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):645 -> a
+    267:267:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):683:683 -> a
+    267:267:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):645 -> a
+    268:268:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):682:682 -> a
+    268:268:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):645 -> a
+    269:269:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):681:681 -> a
+    269:269:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):645 -> a
+    1:2:boolean isSyntheticWrapper(com.android.tools.r8.graph.DexType):105:106 -> b
+    3:13:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):143:153 -> b
+    14:14:java.util.Collection lambda$ensureWrappers$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):253:253 -> b
+    15:15:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):262:262 -> b
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> b
+    16:16:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):262 -> b
+    17:18:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):262:263 -> b
+    19:19:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):273:273 -> b
+    19:19:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):263 -> b
+    20:20:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):264:264 -> b
+    21:21:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):273:273 -> b
+    21:21:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):264 -> b
+    22:26:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):265:269 -> b
+    27:27:void lambda$buildWrapper$8(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.synthesis.SyntheticMethodBuilder):409:409 -> b
+    1:2:com.android.tools.r8.graph.DexEncodedField getWrapperUniqueEncodedField(com.android.tools.r8.graph.DexClass):284:285 -> c
+    3:18:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):480:495 -> c
+    19:19:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> c
+    19:19:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):495 -> c
+    20:24:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):495:499 -> c
+    25:45:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):498:518 -> c
+    46:51:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.finalizeWrapperMethods(java.util.List,java.util.Set):525:530 -> c
+    46:51:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):520 -> c
+    1:1:com.android.tools.r8.graph.DexField getWrapperUniqueField(com.android.tools.r8.graph.DexClass):289:289 -> d
+    2:22:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):429:449 -> d
+    23:36:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):445:458 -> d
+    37:55:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):455:473 -> d
+    56:61:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.finalizeWrapperMethods(java.util.List,java.util.Set):525:530 -> d
+    56:61:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):475 -> d
+    1:1:boolean isInvalidWrapper(com.android.tools.r8.graph.DexClass):362:362 -> e
     2:2:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627:627 -> e
-    2:2:boolean isInvalidWrapper(com.android.tools.r8.graph.DexClass):366 -> e
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions -> com.android.tools.r8.internal.jL0:
+    2:2:boolean isInvalidWrapper(com.android.tools.r8.graph.DexClass):362 -> e
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions -> com.android.tools.r8.internal.mL0:
     com.android.tools.r8.graph.DexMethod vivifiedConversion -> b
     com.android.tools.r8.graph.DexMethod conversion -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):218:220 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethod getConversion():224:224 -> a
-    1:1:com.android.tools.r8.graph.DexMethod getVivifiedConversion():228:228 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer -> com.android.tools.r8.internal.lL0:
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):214:216 -> <init>
+    1:1:com.android.tools.r8.graph.DexMethod getConversion():220:220 -> a
+    1:1:com.android.tools.r8.graph.DexMethod getVivifiedConversion():224:224 -> b
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer -> com.android.tools.r8.internal.oL0:
     void acceptWrapperClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo -> com.android.tools.r8.internal.vl1:
+com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo -> com.android.tools.r8.internal.tl1:
     java.util.Map retargetLibraryMember -> a
     java.util.Map nonFinalHolderRewrites -> b
     com.android.tools.r8.utils.collections.DexClassAndMethodSet emulatedDispatchMethods -> c
@@ -82934,7 +83029,7 @@ com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo -> com.android.
     2:2:com.android.tools.r8.utils.collections.DexClassAndMethodSet getEmulatedDispatchMethods():54:54 -> a
     1:1:java.util.Map getNonFinalHolderRewrites():50:50 -> b
     1:1:java.util.Map getRetargetLibraryMember():46:46 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder -> com.android.tools.r8.internal.ul1:
+com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder -> com.android.tools.r8.internal.sl1:
     com.android.tools.r8.utils.collections.DexClassAndMethodSet emulatedDispatchMethods -> d
     java.util.Map retargetLibraryMember -> b
     java.util.Map nonFinalHolderRewrites -> c
@@ -82977,7 +83072,7 @@ com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfo
     114:116:void lambda$isEmulatedInterfaceDispatch$0(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):173:175 -> a
     117:122:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):183:188 -> a
     123:123:boolean lambda$findMethodsWithName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):185:185 -> a
-com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo -> com.android.tools.r8.internal.aY0:
+com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo -> com.android.tools.r8.internal.dY0:
     com.android.tools.r8.graph.CfCode virtualMethodCode -> c
     com.android.tools.r8.graph.ProgramMethod virtualMethod -> b
     com.android.tools.r8.graph.ProgramMethod newDirectMethod -> a
@@ -82996,7 +83091,7 @@ com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo -> com.and
     4:4:int compareTo(java.lang.Object):10 -> compareTo
     5:5:int com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo.compareTo(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo):37:37 -> compareTo
     5:5:int compareTo(java.lang.Object):10 -> compareTo
-com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring -> com.android.tools.r8.internal.bY0:
+com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring -> com.android.tools.r8.internal.eY0:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):34:35 -> <init>
     1:2:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):40:41 -> a
@@ -83038,7 +83133,7 @@ com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring -> c
     56:56:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.ensureInvokeSpecialBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer):128:128 -> a
     56:56:java.util.List com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):100 -> a
     56:56:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):78 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor -> com.android.tools.r8.internal.eH0:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor -> com.android.tools.r8.internal.hH0:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper helper -> c
@@ -83051,321 +83146,323 @@ com.android.tools.r8.ir.desugar.itf.ClassProcessor -> com.android.tools.r8.inter
     java.util.function.Predicate isLiveMethod -> f
     java.util.Map classInfo -> g
     java.util.Map libraryClassInfo -> h
-    1:1:void <clinit>():68:68 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Predicate):370:370 -> <init>
-    2:34:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Predicate):349:381 -> <init>
-    1:1:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.isLiveMethod(com.android.tools.r8.graph.DexClassAndMethod):385:385 -> a
-    1:1:void lambda$resolveForwardingMethods$7(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod):667 -> a
+    1:1:void <clinit>():66:66 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Predicate):374:374 -> <init>
+    2:34:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Predicate):353:385 -> <init>
+    1:1:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.isLiveMethod(com.android.tools.r8.graph.DexClassAndMethod):389:389 -> a
+    1:1:void lambda$resolveForwardingMethods$8(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod):676 -> a
     2:2:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    2:2:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.isLiveMethod(com.android.tools.r8.graph.DexClassAndMethod):385 -> a
-    2:2:void lambda$resolveForwardingMethods$7(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod):667 -> a
-    3:3:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.isLiveMethod(com.android.tools.r8.graph.DexClassAndMethod):386:386 -> a
-    3:3:void lambda$resolveForwardingMethods$7(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod):667 -> a
-    4:5:void lambda$resolveForwardingMethods$7(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod):667:668 -> a
-    6:33:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):828:855 -> a
-    6:33:void lambda$resolveForwardingMethods$7(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod):669 -> a
-    34:34:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):834:834 -> a
-    34:34:void lambda$resolveForwardingMethods$7(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod):669 -> a
+    2:2:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.isLiveMethod(com.android.tools.r8.graph.DexClassAndMethod):389 -> a
+    2:2:void lambda$resolveForwardingMethods$8(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod):676 -> a
+    3:3:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.isLiveMethod(com.android.tools.r8.graph.DexClassAndMethod):390:390 -> a
+    3:3:void lambda$resolveForwardingMethods$8(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod):676 -> a
+    4:5:void lambda$resolveForwardingMethods$8(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod):676:677 -> a
+    6:33:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):835:862 -> a
+    6:33:void lambda$resolveForwardingMethods$8(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod):678 -> a
+    34:34:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):841:841 -> a
+    34:34:void lambda$resolveForwardingMethods$8(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod):678 -> a
     35:35:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():760:760 -> a
-    35:35:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):837 -> a
-    35:35:void lambda$resolveForwardingMethods$7(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod):669 -> a
-    36:37:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):837:838 -> a
-    36:37:void lambda$resolveForwardingMethods$7(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod):669 -> a
-    38:38:boolean ignoreLibraryInfo():396:396 -> a
-    39:40:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer):402:403 -> a
-    41:46:void finalizeProcessing(com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer):411:416 -> a
-    47:48:void lambda$finalizeProcessing$0(com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):413:414 -> a
-    49:52:void lambda$finalizeProcessing$1(com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass,java.util.List):418:421 -> a
-    53:56:void lambda$finalizeProcessing$1(com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass,java.util.List):420:423 -> a
-    57:63:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures getDefaultMethods(com.android.tools.r8.graph.DexClass):454:460 -> a
-    64:64:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.create(java.util.Set):76:76 -> a
-    64:64:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures getDefaultMethods(com.android.tools.r8.graph.DexClass):460 -> a
-    65:68:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):497:500 -> a
-    69:69:java.util.Set com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.getEmulatedInterfaces():241:241 -> a
-    69:69:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):500 -> a
-    70:71:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):500:501 -> a
-    72:72:java.util.Set com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.getEmulatedInterfaces():241:241 -> a
-    72:72:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):502 -> a
-    73:76:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):502:505 -> a
-    77:77:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    77:77:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):505 -> a
-    78:80:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):505:505 -> a
-    82:92:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):507:517 -> a
-    93:93:java.util.Set com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.getEmulatedInterfaces():241:241 -> a
-    93:93:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):520 -> a
-    94:137:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):520:563 -> a
-    138:147:void lambda$duplicateEmulatedInterfaces$2(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):549:558 -> a
-    148:152:void lambda$duplicateEmulatedInterfaces$2(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):552:556 -> a
-    153:153:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    153:153:void lambda$duplicateEmulatedInterfaces$2(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):556 -> a
-    154:154:void lambda$duplicateEmulatedInterfaces$2(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):556:556 -> a
-    155:168:void collectEmulatedInterfaces(com.android.tools.r8.graph.DexClass,java.util.Set,java.util.Map):571:584 -> a
-    169:173:void lambda$collectEmulatedInterfaces$3(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):574:578 -> a
-    174:180:void lambda$collectEmulatedInterfaces$3(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):575:581 -> a
-    181:181:void lambda$collectEmulatedInterfaces$3(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):580:580 -> a
-    182:184:void lambda$collectEmulatedInterfaces$4(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType):586:588 -> a
-    185:188:void lambda$collectEmulatedInterfaces$4(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType):587:590 -> a
-    189:210:void collectEmulatedInterfacesWithPropagatedTypeArguments(com.android.tools.r8.graph.DexType,java.util.List,java.util.Set,java.util.Map):601:622 -> a
-    211:215:void lambda$collectEmulatedInterfacesWithPropagatedTypeArguments$5(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):611:615 -> a
-    216:221:void lambda$collectEmulatedInterfacesWithPropagatedTypeArguments$5(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):612:617 -> a
-    222:228:void resolveForwardingMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):659:665 -> a
-    229:229:void resolveForwardingMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):663:663 -> a
-    230:242:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):679:691 -> a
-    243:243:boolean com.android.tools.r8.graph.MethodResolutionResult.isSuccessfulMemberResolutionResult():0:0 -> a
-    243:243:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):692 -> a
-    244:244:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):694:694 -> a
-    245:251:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):693:699 -> a
-    252:252:boolean com.android.tools.r8.graph.MethodResolutionResult.isIncompatibleClassChangeErrorResult():0:0 -> a
-    252:252:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):700 -> a
-    253:253:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addICCEThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):773:773 -> a
-    253:253:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):701 -> a
-    254:254:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):704:704 -> a
-    255:255:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addNoSuchMethodErrorThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):781:781 -> a
-    255:255:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):705 -> a
-    256:256:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):708:708 -> a
-    257:257:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addIllegalAccessErrorThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):777:777 -> a
-    257:257:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):709 -> a
-    258:258:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):713:713 -> a
-    259:259:boolean com.android.tools.r8.graph.MethodResolutionResult.isSuccessfulMemberResolutionResult():0:0 -> a
-    259:259:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):713 -> a
-    260:263:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):713:716 -> a
-    264:264:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.needsLibraryInfo():392:392 -> a
-    264:264:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):761 -> a
-    264:264:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):719 -> a
-    265:265:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):761:761 -> a
-    265:265:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):719 -> a
-    266:266:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    266:266:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):761 -> a
-    266:266:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):719 -> a
-    267:267:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):761:761 -> a
-    267:267:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):719 -> a
-    268:269:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):724:725 -> a
-    270:270:boolean com.android.tools.r8.graph.Definition.isLibraryMethod():0:0 -> a
-    270:270:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):730 -> a
-    271:275:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):730:734 -> a
-    276:276:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.needsLibraryInfo():392:392 -> a
-    276:276:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.isRetargetMethod(com.android.tools.r8.graph.LibraryMethod):754 -> a
-    276:276:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):735 -> a
-    277:280:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.isRetargetMethod(com.android.tools.r8.graph.LibraryMethod):754:757 -> a
-    277:280:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):735 -> a
-    281:293:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):736:748 -> a
-    294:294:void lambda$resolveForwardForSignature$8(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexEncodedMethod):691:691 -> a
-    295:297:void addSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):767:769 -> a
-    298:298:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$addSyntheticMethod$9(com.android.tools.r8.graph.DexProgramClass):768:768 -> a
-    299:302:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):785:788 -> a
-    303:303:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setPublic():342:342 -> a
-    303:303:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):788 -> a
-    304:312:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):788:796 -> a
-    313:316:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ClassProcessor.createExceptionThrowingCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):807:810 -> a
-    313:316:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):797 -> a
-    317:317:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ClassProcessor.createExceptionThrowingCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):808:808 -> a
-    317:317:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):797 -> a
-    318:318:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():77:77 -> a
-    318:318:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ClassProcessor.createExceptionThrowingCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):813 -> a
-    318:318:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):797 -> a
-    319:324:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ClassProcessor.createExceptionThrowingCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):813:818 -> a
-    319:324:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):797 -> a
-    325:326:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List):159:160 -> a
-    325:326:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ClassProcessor.createExceptionThrowingCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):818 -> a
-    325:326:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):797 -> a
-    327:327:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List):154:154 -> a
-    327:327:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ClassProcessor.createExceptionThrowingCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):818 -> a
-    327:327:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):797 -> a
-    328:330:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):797:799 -> a
-    331:336:com.android.tools.r8.graph.DexClass definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):862:867 -> a
-    337:349:java.lang.Object reentrantComputeIfAbsent(java.util.Map,com.android.tools.r8.graph.DexClass,java.util.function.Function):878:890 -> a
-    350:350:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):899:899 -> a
-    351:351:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    351:351:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):900 -> a
-    352:354:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):901:903 -> a
-    355:356:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):909:910 -> a
-    355:356:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$10(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):903 -> a
-    357:358:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):894:895 -> a
-    357:358:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):910 -> a
-    357:358:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$10(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):903 -> a
-    359:362:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):911:914 -> a
-    359:362:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$10(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):903 -> a
-    363:363:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo.isEmpty():145:145 -> a
-    363:363:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):914 -> a
-    363:363:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$10(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):903 -> a
-    364:367:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):914:917 -> a
-    364:367:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$10(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):903 -> a
-    368:373:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):473:478 -> a
-    368:373:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):919 -> a
-    368:373:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$10(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):903 -> a
-    374:382:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):638:646 -> a
-    374:382:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):478 -> a
-    374:382:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):919 -> a
-    374:382:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$10(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):903 -> a
-    383:383:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    383:383:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):646 -> a
-    383:383:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):478 -> a
-    383:383:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):919 -> a
-    383:383:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$10(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):903 -> a
-    384:384:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):646:646 -> a
-    384:384:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):478 -> a
-    384:384:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):919 -> a
-    384:384:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$10(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):903 -> a
-    385:385:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo.contains(com.android.tools.r8.graph.DexType):289:289 -> a
-    385:385:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):647 -> a
-    385:385:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):478 -> a
-    385:385:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):919 -> a
-    385:385:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$10(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):903 -> a
-    386:386:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.contains(com.android.tools.r8.graph.DexType):237:237 -> a
-    386:386:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo.contains(com.android.tools.r8.graph.DexType):289 -> a
-    386:386:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):647 -> a
-    386:386:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):478 -> a
-    386:386:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):919 -> a
-    386:386:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$10(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):903 -> a
-    387:387:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.emulatedInterfaceSignaturesToForward():193:193 -> a
-    387:387:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):483 -> a
-    387:387:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):919 -> a
-    387:387:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$10(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):903 -> a
-    388:390:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.withoutAll(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):102:104 -> a
-    388:390:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.emulatedInterfaceSignaturesToForward():193 -> a
-    388:390:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):483 -> a
-    388:390:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):919 -> a
-    388:390:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$10(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):903 -> a
-    391:397:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):480:486 -> a
-    391:397:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):919 -> a
-    391:397:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$10(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):903 -> a
-    398:400:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo.create(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):139:141 -> a
-    398:400:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):486 -> a
-    398:400:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):919 -> a
-    398:400:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$10(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):903 -> a
-    401:401:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):489:489 -> a
-    401:401:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):919 -> a
-    401:401:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$10(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):903 -> a
-    402:402:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):488:488 -> a
-    402:402:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):919 -> a
-    402:402:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$10(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):903 -> a
-    403:405:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo.create(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):139:141 -> a
-    403:405:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):488 -> a
-    403:405:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):919 -> a
-    403:405:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$10(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):903 -> a
-    406:407:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexType):924:925 -> a
-    408:411:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor.definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):862:865 -> a
-    408:411:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexType):927 -> a
-    412:412:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):337:337 -> a
-    412:412:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor.definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):865 -> a
-    412:412:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexType):927 -> a
-    413:413:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexType):928:928 -> a
-    414:417:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):940:943 -> a
+    35:35:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):844 -> a
+    35:35:void lambda$resolveForwardingMethods$8(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod):678 -> a
+    36:37:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):844:845 -> a
+    36:37:void lambda$resolveForwardingMethods$8(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod):678 -> a
+    38:38:boolean ignoreLibraryInfo():400:400 -> a
+    39:40:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer):406:407 -> a
+    41:41:void lambda$process$0(com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):412:412 -> a
+    42:47:void finalizeProcessing(com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer):420:425 -> a
+    48:49:void lambda$finalizeProcessing$1(com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):422:423 -> a
+    50:53:void lambda$finalizeProcessing$2(com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass,java.util.List):427:430 -> a
+    54:57:void lambda$finalizeProcessing$2(com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass,java.util.List):429:432 -> a
+    58:64:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures getDefaultMethods(com.android.tools.r8.graph.DexClass):463:469 -> a
+    65:65:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.create(java.util.Set):74:74 -> a
+    65:65:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures getDefaultMethods(com.android.tools.r8.graph.DexClass):469 -> a
+    66:69:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):506:509 -> a
+    70:70:java.util.Set com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.getEmulatedInterfaces():239:239 -> a
+    70:70:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):509 -> a
+    71:72:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):509:510 -> a
+    73:73:java.util.Set com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.getEmulatedInterfaces():239:239 -> a
+    73:73:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):511 -> a
+    74:77:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):511:514 -> a
+    78:78:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    78:78:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):514 -> a
+    79:81:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):514:514 -> a
+    83:93:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):516:526 -> a
+    94:94:java.util.Set com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.getEmulatedInterfaces():239:239 -> a
+    94:94:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):529 -> a
+    95:138:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):529:572 -> a
+    139:148:void lambda$duplicateEmulatedInterfaces$3(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):558:567 -> a
+    149:153:void lambda$duplicateEmulatedInterfaces$3(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):561:565 -> a
+    154:154:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    154:154:void lambda$duplicateEmulatedInterfaces$3(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):565 -> a
+    155:155:void lambda$duplicateEmulatedInterfaces$3(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):565:565 -> a
+    156:169:void collectEmulatedInterfaces(com.android.tools.r8.graph.DexClass,java.util.Set,java.util.Map):580:593 -> a
+    170:174:void lambda$collectEmulatedInterfaces$4(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):583:587 -> a
+    175:181:void lambda$collectEmulatedInterfaces$4(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):584:590 -> a
+    182:182:void lambda$collectEmulatedInterfaces$4(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):589:589 -> a
+    183:185:void lambda$collectEmulatedInterfaces$5(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType):595:597 -> a
+    186:189:void lambda$collectEmulatedInterfaces$5(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType):596:599 -> a
+    190:211:void collectEmulatedInterfacesWithPropagatedTypeArguments(com.android.tools.r8.graph.DexType,java.util.List,java.util.Set,java.util.Map):610:631 -> a
+    212:216:void lambda$collectEmulatedInterfacesWithPropagatedTypeArguments$6(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):620:624 -> a
+    217:222:void lambda$collectEmulatedInterfacesWithPropagatedTypeArguments$6(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):621:626 -> a
+    223:229:void resolveForwardingMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):668:674 -> a
+    230:230:void resolveForwardingMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):672:672 -> a
+    231:243:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):688:700 -> a
+    244:244:boolean com.android.tools.r8.graph.MethodResolutionResult.isSuccessfulMemberResolutionResult():0:0 -> a
+    244:244:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):701 -> a
+    245:245:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):703:703 -> a
+    246:252:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):702:708 -> a
+    253:253:boolean com.android.tools.r8.graph.MethodResolutionResult.isIncompatibleClassChangeErrorResult():0:0 -> a
+    253:253:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):709 -> a
+    254:254:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addICCEThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):782:782 -> a
+    254:254:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):710 -> a
+    255:255:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):713:713 -> a
+    256:256:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addNoSuchMethodErrorThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):790:790 -> a
+    256:256:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):714 -> a
+    257:257:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):717:717 -> a
+    258:258:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addIllegalAccessErrorThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):786:786 -> a
+    258:258:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):718 -> a
+    259:259:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):722:722 -> a
+    260:260:boolean com.android.tools.r8.graph.MethodResolutionResult.isSuccessfulMemberResolutionResult():0:0 -> a
+    260:260:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):722 -> a
+    261:264:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):722:725 -> a
+    265:265:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.needsLibraryInfo():396:396 -> a
+    265:265:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):770 -> a
+    265:265:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):728 -> a
+    266:266:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):770:770 -> a
+    266:266:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):728 -> a
+    267:267:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    267:267:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):770 -> a
+    267:267:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):728 -> a
+    268:268:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):770:770 -> a
+    268:268:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):728 -> a
+    269:270:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):733:734 -> a
+    271:271:boolean com.android.tools.r8.graph.Definition.isLibraryMethod():0:0 -> a
+    271:271:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):739 -> a
+    272:276:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):739:743 -> a
+    277:277:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.needsLibraryInfo():396:396 -> a
+    277:277:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.isRetargetMethod(com.android.tools.r8.graph.LibraryMethod):763 -> a
+    277:277:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):744 -> a
+    278:281:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.isRetargetMethod(com.android.tools.r8.graph.LibraryMethod):763:766 -> a
+    278:281:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):744 -> a
+    282:294:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):745:757 -> a
+    295:295:void lambda$resolveForwardForSignature$9(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexEncodedMethod):700:700 -> a
+    296:298:void addSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):776:778 -> a
+    299:299:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$addSyntheticMethod$10(com.android.tools.r8.graph.DexProgramClass):777:777 -> a
+    300:303:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):794:797 -> a
+    304:304:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setPublic():342:342 -> a
+    304:304:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):797 -> a
+    305:310:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):797:802 -> a
+    311:314:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ClassProcessor.createExceptionThrowingCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):814:817 -> a
+    311:314:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):804 -> a
+    315:315:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ClassProcessor.createExceptionThrowingCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):815:815 -> a
+    315:315:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):804 -> a
+    316:316:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():77:77 -> a
+    316:316:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ClassProcessor.createExceptionThrowingCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):820 -> a
+    316:316:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):804 -> a
+    317:322:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ClassProcessor.createExceptionThrowingCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):820:825 -> a
+    317:322:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):804 -> a
+    323:324:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List):159:160 -> a
+    323:324:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ClassProcessor.createExceptionThrowingCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):825 -> a
+    323:324:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):804 -> a
+    325:325:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List):154:154 -> a
+    325:325:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ClassProcessor.createExceptionThrowingCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):825 -> a
+    325:325:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):804 -> a
+    326:329:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):803:806 -> a
+    330:335:com.android.tools.r8.graph.DexClass definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):869:874 -> a
+    336:348:java.lang.Object reentrantComputeIfAbsent(java.util.Map,com.android.tools.r8.graph.DexClass,java.util.function.Function):885:897 -> a
+    349:349:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):906:906 -> a
+    350:350:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    350:350:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):907 -> a
+    351:353:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):908:910 -> a
+    354:355:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):916:917 -> a
+    354:355:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):910 -> a
+    356:357:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):901:902 -> a
+    356:357:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):917 -> a
+    356:357:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):910 -> a
+    358:361:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):918:921 -> a
+    358:361:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):910 -> a
+    362:362:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo.isEmpty():143:143 -> a
+    362:362:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):921 -> a
+    362:362:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):910 -> a
+    363:366:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):921:924 -> a
+    363:366:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):910 -> a
+    367:372:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):482:487 -> a
+    367:372:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):926 -> a
+    367:372:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):910 -> a
+    373:381:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):647:655 -> a
+    373:381:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):487 -> a
+    373:381:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):926 -> a
+    373:381:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):910 -> a
+    382:382:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    382:382:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):655 -> a
+    382:382:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):487 -> a
+    382:382:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):926 -> a
+    382:382:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):910 -> a
+    383:383:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):655:655 -> a
+    383:383:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):487 -> a
+    383:383:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):926 -> a
+    383:383:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):910 -> a
+    384:384:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo.contains(com.android.tools.r8.graph.DexType):287:287 -> a
+    384:384:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):656 -> a
+    384:384:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):487 -> a
+    384:384:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):926 -> a
+    384:384:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):910 -> a
+    385:385:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.contains(com.android.tools.r8.graph.DexType):235:235 -> a
+    385:385:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo.contains(com.android.tools.r8.graph.DexType):287 -> a
+    385:385:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.shouldResolveForwardingMethodsForEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):656 -> a
+    385:385:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):487 -> a
+    385:385:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):926 -> a
+    385:385:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):910 -> a
+    386:386:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.emulatedInterfaceSignaturesToForward():191:191 -> a
+    386:386:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):492 -> a
+    386:386:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):926 -> a
+    386:386:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):910 -> a
+    387:389:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.withoutAll(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):100:102 -> a
+    387:389:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.emulatedInterfaceSignaturesToForward():191 -> a
+    387:389:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):492 -> a
+    387:389:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):926 -> a
+    387:389:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):910 -> a
+    390:396:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):489:495 -> a
+    390:396:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):926 -> a
+    390:396:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):910 -> a
+    397:399:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo.create(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):137:139 -> a
+    397:399:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):495 -> a
+    397:399:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):926 -> a
+    397:399:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):910 -> a
+    400:400:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):498:498 -> a
+    400:400:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):926 -> a
+    400:400:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):910 -> a
+    401:401:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):497:497 -> a
+    401:401:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):926 -> a
+    401:401:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):910 -> a
+    402:404:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo.create(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):137:139 -> a
+    402:404:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):497 -> a
+    402:404:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):926 -> a
+    402:404:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):910 -> a
+    405:406:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexType):931:932 -> a
+    407:410:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor.definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):869:872 -> a
+    407:410:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexType):934 -> a
+    411:411:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):341:341 -> a
+    411:411:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.itf.ClassProcessor.definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):872 -> a
+    411:411:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexType):934 -> a
+    412:412:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexType):935:935 -> a
+    413:416:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):947:950 -> a
     1:1:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
-    1:1:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):954 -> b
-    2:5:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):954:957 -> b
-    6:9:void lambda$collectEmulatedInterfacesWithPropagatedTypeArguments$6(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType):624:627 -> b
-    10:14:void lambda$collectEmulatedInterfacesWithPropagatedTypeArguments$6(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType):625:629 -> b
-    15:15:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):932:932 -> b
+    1:1:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):961 -> b
+    2:5:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):961:964 -> b
+    6:9:void lambda$collectEmulatedInterfacesWithPropagatedTypeArguments$7(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType):633:636 -> b
+    10:14:void lambda$collectEmulatedInterfacesWithPropagatedTypeArguments$7(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType):634:638 -> b
+    15:15:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):939:939 -> b
     16:16:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
-    16:16:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):933 -> b
-    17:19:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):934:934 -> b
-    21:21:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):936:936 -> b
-    22:23:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):949:950 -> b
-    24:29:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):962:967 -> b
-    24:29:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo lambda$visitInterfaceInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):958 -> b
-    30:32:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeEmulatedInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):443:445 -> b
-    30:32:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):968 -> b
-    30:32:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo lambda$visitInterfaceInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):958 -> b
-    33:33:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.needsLibraryInfo():392:392 -> b
-    33:33:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeEmulatedInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):446 -> b
-    33:33:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):968 -> b
-    33:33:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo lambda$visitInterfaceInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):958 -> b
-    34:38:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeEmulatedInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):446:450 -> b
-    34:38:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):968 -> b
-    34:38:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo lambda$visitInterfaceInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):958 -> b
-    39:41:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):430:432 -> b
-    39:41:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):969 -> b
-    39:41:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo lambda$visitInterfaceInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):958 -> b
+    16:16:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):940 -> b
+    17:19:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):941:941 -> b
+    21:21:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):943:943 -> b
+    22:23:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):956:957 -> b
+    24:29:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):969:974 -> b
+    24:29:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo lambda$visitInterfaceInfo$12(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):965 -> b
+    30:32:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeEmulatedInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):452:454 -> b
+    30:32:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):975 -> b
+    30:32:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo lambda$visitInterfaceInfo$12(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):965 -> b
+    33:33:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.needsLibraryInfo():396:396 -> b
+    33:33:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeEmulatedInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):455 -> b
+    33:33:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):975 -> b
+    33:33:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo lambda$visitInterfaceInfo$12(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):965 -> b
+    34:38:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeEmulatedInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):455:459 -> b
+    34:38:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):975 -> b
+    34:38:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo lambda$visitInterfaceInfo$12(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):965 -> b
+    39:41:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):439:441 -> b
+    39:41:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):976 -> b
+    39:41:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo lambda$visitInterfaceInfo$12(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):965 -> b
     42:42:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
-    42:42:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):434 -> b
-    42:42:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):969 -> b
-    42:42:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo lambda$visitInterfaceInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):958 -> b
-    43:43:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.needsLibraryInfo():392:392 -> b
-    43:43:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):434 -> b
-    43:43:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):969 -> b
-    43:43:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo lambda$visitInterfaceInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):958 -> b
-    44:46:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):434:436 -> b
-    44:46:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):969 -> b
-    44:46:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo lambda$visitInterfaceInfo$11(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):958 -> b
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$1 -> com.android.tools.r8.internal.WG0:
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo -> com.android.tools.r8.internal.XG0:
+    42:42:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):443 -> b
+    42:42:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):976 -> b
+    42:42:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo lambda$visitInterfaceInfo$12(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):965 -> b
+    43:43:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.needsLibraryInfo():396:396 -> b
+    43:43:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):443 -> b
+    43:43:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):976 -> b
+    43:43:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo lambda$visitInterfaceInfo$12(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):965 -> b
+    44:46:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):443:445 -> b
+    44:46:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):976 -> b
+    44:46:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo lambda$visitInterfaceInfo$12(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):965 -> b
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$1 -> com.android.tools.r8.internal.ZG0:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo -> com.android.tools.r8.internal.aH0:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo parent -> a
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo EMPTY -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList forwardedMethodTargets -> b
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo emulatedInterfaceInfo -> c
-    1:2:void <clinit>():113:114 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):129:132 -> <init>
-    1:1:boolean isTargetedByForwards(com.android.tools.r8.graph.DexClassAndMethod):149:149 -> a
+    1:2:void <clinit>():111:112 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):127:130 -> <init>
+    1:1:boolean isTargetedByForwards(com.android.tools.r8.graph.DexClassAndMethod):147:147 -> a
     2:3:boolean com.android.tools.r8.utils.IterableUtils.any(java.lang.Iterable,java.util.function.Function,java.util.function.Predicate):43:44 -> a
-    2:3:boolean isTargetedByForwards(com.android.tools.r8.graph.DexClassAndMethod):149 -> a
-    4:8:boolean isTargetedByForwards(com.android.tools.r8.graph.DexClassAndMethod):149:153 -> a
-    9:9:boolean lambda$isTargetedByForwards$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexEncodedMethod):152:152 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo -> com.android.tools.r8.internal.YG0:
+    2:3:boolean isTargetedByForwards(com.android.tools.r8.graph.DexClassAndMethod):147 -> a
+    4:8:boolean isTargetedByForwards(com.android.tools.r8.graph.DexClassAndMethod):147:151 -> a
+    9:9:boolean lambda$isTargetedByForwards$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexEncodedMethod):150:150 -> a
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo -> com.android.tools.r8.internal.bH0:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures signatures -> a
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces emulatedInterfaces -> b
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo EMPTY -> c
     boolean $assertionsDisabled -> d
-    1:3:void <clinit>():258:260 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces,com.android.tools.r8.ir.desugar.itf.ClassProcessor$1):258:258 -> <init>
-    2:4:void <init>(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):267:269 -> <init>
-    1:8:com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):273:280 -> a
-    9:9:boolean isEmpty():284:284 -> a
-    10:10:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.isEmpty():233:233 -> a
-    10:10:boolean isEmpty():284 -> a
-    11:11:boolean isEmpty():284:284 -> a
-    12:12:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():98:98 -> a
-    12:12:boolean isEmpty():284 -> a
-    13:14:boolean isEmpty():284:285 -> a
-    15:15:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.isEmpty():233:233 -> a
-    15:15:boolean isEmpty():285 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces -> com.android.tools.r8.internal.ZG0:
+    1:3:void <clinit>():256:258 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces,com.android.tools.r8.ir.desugar.itf.ClassProcessor$1):256:256 -> <init>
+    2:4:void <init>(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):265:267 -> <init>
+    1:8:com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):271:278 -> a
+    9:9:boolean isEmpty():282:282 -> a
+    10:10:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.isEmpty():231:231 -> a
+    10:10:boolean isEmpty():282 -> a
+    11:11:boolean isEmpty():282:282 -> a
+    12:12:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():96:96 -> a
+    12:12:boolean isEmpty():282 -> a
+    13:14:boolean isEmpty():282:283 -> a
+    15:15:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.isEmpty():231:231 -> a
+    15:15:boolean isEmpty():283 -> a
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces -> com.android.tools.r8.internal.cH0:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces EMPTY -> b
     java.util.Set emulatedInterfaces -> a
-    1:1:void <clinit>():220:220 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexType):224:225 -> <init>
-    3:4:void <init>(java.util.Set):228:229 -> <init>
-    1:4:com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):245:248 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.internal.aH0:
-    com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext LIBRARY_CONTEXT -> c
-    1:1:void <clinit>():324:324 -> <clinit>
-    1:1:void <init>():327:327 -> <init>
+    1:1:void <clinit>():218:218 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexType):222:223 -> <init>
+    3:4:void <init>(java.util.Set):226:227 -> <init>
+    1:4:com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):243:246 -> a
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.internal.dH0:
+    com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext LIBRARY_CONTEXT -> d
+    1:1:void <clinit>():328:328 -> <clinit>
+    1:1:void <init>():331:331 -> <init>
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext forClass(com.android.tools.r8.graph.DexClass) -> a
-    void reportMissingType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper) -> a
-    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):337:337 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures -> com.android.tools.r8.internal.bH0:
+    void reportMissingType(com.android.tools.r8.graph.DexType) -> a
+    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):341:341 -> a
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures -> com.android.tools.r8.internal.eH0:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures EMPTY -> b
     java.util.Set signatures -> a
-    1:1:void <clinit>():73:73 -> <clinit>
-    1:2:void <init>(java.util.Set):81:82 -> <init>
-    1:1:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():98:98 -> a
-    1:1:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):86 -> a
-    2:2:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():98:98 -> a
-    2:2:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):89 -> a
-    3:5:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):92:94 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext -> com.android.tools.r8.internal.cH0:
+    1:1:void <clinit>():71:71 -> <clinit>
+    1:2:void <init>(java.util.Set):79:80 -> <init>
+    1:1:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():96:96 -> a
+    1:1:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):84 -> a
+    2:2:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():96:96 -> a
+    2:2:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):87 -> a
+    3:5:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):90:92 -> a
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext -> com.android.tools.r8.internal.fH0:
     com.android.tools.r8.graph.DexClass directSubClass -> a
     com.android.tools.r8.graph.DexProgramClass closestProgramSubClass -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):299:301 -> <init>
-    1:5:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext forClass(com.android.tools.r8.graph.DexClass):305:309 -> a
-    6:6:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):313:313 -> a
-    7:7:void reportMissingType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper):317:317 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo -> com.android.tools.r8.internal.dH0:
+    java.util.function.BiConsumer reportMissingTypeCallback -> c
+    1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.BiConsumer):301:304 -> <init>
+    1:5:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext forClass(com.android.tools.r8.graph.DexClass):308:312 -> a
+    6:6:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):317:317 -> a
+    7:7:void reportMissingType(com.android.tools.r8.graph.DexType):321:321 -> a
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo -> com.android.tools.r8.internal.gH0:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo EMPTY -> c
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures signatures -> a
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo emulatedInterfaceInfo -> b
-    1:1:void <clinit>():161:161 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):168:170 -> <init>
-    1:1:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():98:98 -> a
-    1:1:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo withSignatures(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):201 -> a
-    2:3:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo withSignatures(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):204:205 -> a
-    4:12:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):181:189 -> a
-    13:13:boolean isEmpty():197:197 -> a
-    14:14:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():98:98 -> a
-    14:14:boolean isEmpty():197 -> a
-    15:15:boolean isEmpty():197:197 -> a
-    16:20:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo withEmulatedInterfaceInfo(com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):210:214 -> a
-com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper -> com.android.tools.r8.internal.zK0:
+    1:1:void <clinit>():159:159 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):166:168 -> <init>
+    1:1:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():96:96 -> a
+    1:1:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo withSignatures(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):199 -> a
+    2:3:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo withSignatures(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):202:203 -> a
+    4:12:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):179:187 -> a
+    13:13:boolean isEmpty():195:195 -> a
+    14:14:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():96:96 -> a
+    14:14:boolean isEmpty():195 -> a
+    15:15:boolean isEmpty():195:195 -> a
+    16:20:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo withEmulatedInterfaceInfo(com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):208:212 -> a
+com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper -> com.android.tools.r8.internal.CK0:
     java.util.Set candidates -> a
     java.util.Set hidden -> b
     1:5:void <init>():17:21 -> <init>
@@ -83373,8 +83470,8 @@ com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper -> com.android.tools.r8
     3:8:void hideMatches(com.android.tools.r8.graph.DexMethod):65:70 -> a
     9:9:void addDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):76:76 -> a
     10:13:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection wrapInCollection():81:84 -> a
-com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$1 -> com.android.tools.r8.internal.xK0:
-com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection -> com.android.tools.r8.internal.yK0:
+com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$1 -> com.android.tools.r8.internal.AK0:
+com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection -> com.android.tools.r8.internal.BK0:
     java.util.List hidden -> b
     java.util.List live -> a
     com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection EMPTY -> c
@@ -83384,14 +83481,14 @@ com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection -> com.andro
     1:1:java.util.List access$000(com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection):28:28 -> a
     2:4:com.android.tools.r8.graph.DexMethod getSingleCandidate(com.android.tools.r8.graph.DexMethod):46:48 -> a
     1:1:java.util.List access$100(com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection):28:28 -> b
-com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter -> com.android.tools.r8.internal.kN0:
+com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter -> com.android.tools.r8.internal.nN0:
     java.util.Map emulatedInterfaces -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():24:24 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView):29:32 -> <init>
     1:1:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):36:36 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
     2:2:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):36 -> a
     3:6:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):36:39 -> a
     7:23:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.rewriteEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):88:104 -> a
@@ -83421,167 +83518,166 @@ com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter -> com.
     71:76:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):45 -> a
     77:80:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):47:50 -> a
     81:84:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.lang.Iterable,com.android.tools.r8.graph.DexType):151:154 -> a
-com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringForTesting -> com.android.tools.r8.internal.cX0:
+com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringForTesting -> com.android.tools.r8.internal.fX0:
     1:1:java.lang.String getCompanionClassNameSuffix():14:14 -> a
     2:2:java.lang.String getCompanionClassDescriptor(java.lang.String):26:26 -> a
     1:1:java.lang.String getDefaultMethodPrefix():18:18 -> b
     1:1:java.lang.String getEmulateLibraryClassNameSuffix():10:10 -> c
     1:1:java.lang.String getPrivateMethodPrefix():22:22 -> d
-com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringProcessor -> com.android.tools.r8.internal.dX0:
+com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringProcessor -> com.android.tools.r8.internal.gX0:
     void finalizeProcessing(com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer) -> a
     void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer) -> a
-com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper -> com.android.tools.r8.internal.eX0:
+com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper -> com.android.tools.r8.internal.hX0:
     java.util.Map emulatedInterfaces -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> e
     java.util.function.Predicate shouldIgnoreFromReportsPredicate -> c
     com.android.tools.r8.cf.CfVersion MAX_INTERFACE_DESUGARED_CF_VERSION -> d
-    1:5:void <clinit>():50:54 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.graph.AppView):70:75 -> <init>
+    1:5:void <clinit>():48:52 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.graph.AppView):68:73 -> <init>
     void lambda$ensureEmulatedInterfaceMethod$0(com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder) -> a
     void lambda$ensureMethodOfClasspathCompanionClassStub$10(com.android.tools.r8.graph.DexClasspathClass) -> a
-    1:1:java.util.Set getEmulatedInterfaces():87:87 -> a
-    2:2:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):95:95 -> a
+    1:1:java.util.Set getEmulatedInterfaces():85:85 -> a
+    2:2:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):93:93 -> a
     3:3:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    3:3:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):95 -> a
-    4:4:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):95:95 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
-    5:5:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):95 -> a
-    6:7:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):95:96 -> a
-    8:8:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.isEmulatedInterface(com.android.tools.r8.graph.DexType):79:79 -> a
-    8:8:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):96 -> a
-    9:9:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):99:99 -> a
-    10:11:boolean dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):104:105 -> a
+    3:3:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):93 -> a
+    4:4:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):93:93 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
+    5:5:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):93 -> a
+    6:7:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):93:94 -> a
+    8:8:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.isEmulatedInterface(com.android.tools.r8.graph.DexType):77:77 -> a
+    8:8:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):94 -> a
+    9:9:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):97:97 -> a
+    10:11:boolean dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):102:103 -> a
     12:12:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> a
-    12:12:boolean dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):106 -> a
-    13:13:boolean dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):106:106 -> a
-    14:28:boolean isCompatibleDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):114:128 -> a
-    29:29:boolean isCompatibleDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):121:121 -> a
-    30:30:java.lang.String getCompanionClassDescriptor(java.lang.String):155:155 -> a
-    31:34:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):160:163 -> a
-    35:37:com.android.tools.r8.graph.DexClasspathClass ensureEmulatedInterfaceMarkerInterface(com.android.tools.r8.graph.DexType):192:194 -> a
-    38:38:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):203:203 -> a
+    12:12:boolean dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):104 -> a
+    13:13:boolean dontRewrite(com.android.tools.r8.graph.DexClassAndMethod):104:104 -> a
+    14:28:boolean isCompatibleDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):112:126 -> a
+    29:29:boolean isCompatibleDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):119:119 -> a
+    30:30:java.lang.String getCompanionClassDescriptor(java.lang.String):153:153 -> a
+    31:34:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):158:161 -> a
+    35:37:com.android.tools.r8.graph.DexClasspathClass ensureEmulatedInterfaceMarkerInterface(com.android.tools.r8.graph.DexType):190:192 -> a
+    38:38:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):201:201 -> a
     39:39:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    39:39:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):204 -> a
-    40:40:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):205:205 -> a
-    41:41:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
-    41:41:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):205 -> a
-    42:48:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):205:211 -> a
-    49:61:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):209:221 -> a
-    62:62:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):217:217 -> a
-    63:63:void lambda$ensureEmulatedInterfaceMethod$1(com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer,com.android.tools.r8.graph.DexClasspathClass):228:228 -> a
-    64:65:void lambda$ensureEmulatedInterfaceMethod$2(com.android.tools.r8.synthesis.SyntheticMethodBuilder):233:234 -> a
-    66:68:com.android.tools.r8.graph.ProgramMethod ensureDefaultAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):260:262 -> a
-    69:69:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):336:336 -> a
-    69:69:com.android.tools.r8.graph.ProgramMethod ensureDefaultAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):262 -> a
-    70:72:com.android.tools.r8.graph.ProgramMethod ensureDefaultAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):264:266 -> a
-    73:73:com.android.tools.r8.graph.ProgramMethod ensureDefaultAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):263:263 -> a
-    74:82:void lambda$ensureDefaultAsMethodOfProgramCompanionClassStub$4(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):269:277 -> a
-    83:88:void lambda$ensureDefaultAsMethodOfProgramCompanionClassStub$4(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):274:279 -> a
-    89:91:void lambda$ensureDefaultAsMethodOfProgramCompanionClassStub$4(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):278:280 -> a
-    92:92:com.android.tools.r8.graph.Code lambda$ensureDefaultAsMethodOfProgramCompanionClassStub$3(com.android.tools.r8.graph.DexMethod):280:280 -> a
-    93:103:void lambda$ensurePrivateAsMethodOfProgramCompanionClassStub$7(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):295:305 -> a
-    104:113:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):321:330 -> a
-    114:114:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):327:327 -> a
-    115:115:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):336:336 -> a
-    116:119:com.android.tools.r8.graph.DexClassAndMethod ensureMethodOfClasspathCompanionClassStub(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView):352:355 -> a
-    120:120:com.android.tools.r8.graph.DexClassAndMethod ensureMethodOfClasspathCompanionClassStub(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView):353:353 -> a
-    121:121:void lambda$ensureStaticAsMethodOfProgramCompanionClassStub$14(com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):390:390 -> a
-    122:133:com.android.tools.r8.graph.ProgramMethod ensureMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):395:406 -> a
-    134:138:void ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):411:415 -> a
-    139:139:void ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):412:412 -> a
-    140:140:boolean lambda$findExistingStaticClinitFieldToTriggerInterfaceInitialization$17(com.android.tools.r8.graph.DexEncodedField):444:444 -> a
-    141:144:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):452:455 -> a
-    145:152:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):454:461 -> a
-    153:153:com.android.tools.r8.graph.FieldAccessFlags$Builder com.android.tools.r8.graph.FieldAccessFlags.builder():48:48 -> a
-    153:153:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):461 -> a
-    154:156:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):461:463 -> a
-    157:157:void com.android.tools.r8.graph.DexEncodedField.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):69:69 -> a
-    157:157:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):463 -> a
-    158:158:boolean lambda$createStaticClinitFieldToTriggerInterfaceInitialization$18(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):458:458 -> a
-    159:159:void createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):471:471 -> a
-    160:162:void createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):470:472 -> a
-    163:163:com.android.tools.r8.cf.CfVersion com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.getInterfaceDesugaredCfVersion(com.android.tools.r8.cf.CfVersion):57:57 -> a
-    163:163:void createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):472 -> a
-    164:164:com.android.tools.r8.utils.structural.Ordered com.android.tools.r8.utils.structural.Ordered.min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> a
-    164:164:com.android.tools.r8.cf.CfVersion com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.getInterfaceDesugaredCfVersion(com.android.tools.r8.cf.CfVersion):57 -> a
-    164:164:void createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):472 -> a
-    165:166:void createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):472:473 -> a
-    167:173:com.android.tools.r8.graph.Code lambda$createCompanionClassInitializer$19(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):475:481 -> a
-    174:179:com.android.tools.r8.graph.Code lambda$createCompanionClassInitializer$19(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):480:485 -> a
-    180:183:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.ensureStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):424:427 -> a
-    180:183:com.android.tools.r8.graph.Code lambda$createCompanionClassInitializer$19(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):488 -> a
-    184:196:com.android.tools.r8.graph.Code lambda$createCompanionClassInitializer$19(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):489:501 -> a
-    197:207:com.android.tools.r8.graph.Code lambda$createCompanionClassInitializer$19(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):494:504 -> a
-    208:214:java.util.function.Predicate getShouldIgnoreFromReportsPredicate(com.android.tools.r8.graph.AppView):509:515 -> a
-    215:216:boolean lambda$getShouldIgnoreFromReportsPredicate$20(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType):516:517 -> a
-    217:217:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):34:34 -> a
-    217:217:boolean lambda$getShouldIgnoreFromReportsPredicate$20(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType):517 -> a
-    218:218:boolean lambda$getShouldIgnoreFromReportsPredicate$20(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType):518:518 -> a
-    219:219:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.isRewrittenEmulatedInterface(com.android.tools.r8.graph.DexType):83:83 -> a
-    219:219:boolean lambda$getShouldIgnoreFromReportsPredicate$20(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType):519 -> a
-    220:222:boolean lambda$getShouldIgnoreFromReportsPredicate$20(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType):519:521 -> a
-    223:223:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):526:526 -> a
-    223:223:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):532 -> a
-    224:224:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):535:535 -> a
+    39:39:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):202 -> a
+    40:40:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):203:203 -> a
+    41:41:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
+    41:41:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):203 -> a
+    42:48:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):203:209 -> a
+    49:61:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):207:219 -> a
+    62:62:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):215:215 -> a
+    63:63:void lambda$ensureEmulatedInterfaceMethod$1(com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer,com.android.tools.r8.graph.DexClasspathClass):226:226 -> a
+    64:65:void lambda$ensureEmulatedInterfaceMethod$2(com.android.tools.r8.synthesis.SyntheticMethodBuilder):231:232 -> a
+    66:68:com.android.tools.r8.graph.ProgramMethod ensureDefaultAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):258:260 -> a
+    69:69:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):334:334 -> a
+    69:69:com.android.tools.r8.graph.ProgramMethod ensureDefaultAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):260 -> a
+    70:72:com.android.tools.r8.graph.ProgramMethod ensureDefaultAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):262:264 -> a
+    73:73:com.android.tools.r8.graph.ProgramMethod ensureDefaultAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):261:261 -> a
+    74:82:void lambda$ensureDefaultAsMethodOfProgramCompanionClassStub$4(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):267:275 -> a
+    83:88:void lambda$ensureDefaultAsMethodOfProgramCompanionClassStub$4(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):272:277 -> a
+    89:91:void lambda$ensureDefaultAsMethodOfProgramCompanionClassStub$4(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):276:278 -> a
+    92:92:com.android.tools.r8.graph.Code lambda$ensureDefaultAsMethodOfProgramCompanionClassStub$3(com.android.tools.r8.graph.DexMethod):278:278 -> a
+    93:103:void lambda$ensurePrivateAsMethodOfProgramCompanionClassStub$7(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):293:303 -> a
+    104:113:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):319:328 -> a
+    114:114:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):325:325 -> a
+    115:115:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):334:334 -> a
+    116:119:com.android.tools.r8.graph.DexClassAndMethod ensureMethodOfClasspathCompanionClassStub(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView):350:353 -> a
+    120:120:com.android.tools.r8.graph.DexClassAndMethod ensureMethodOfClasspathCompanionClassStub(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView):351:351 -> a
+    121:121:void lambda$ensureStaticAsMethodOfProgramCompanionClassStub$14(com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):388:388 -> a
+    122:133:com.android.tools.r8.graph.ProgramMethod ensureMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):393:404 -> a
+    134:138:void ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):409:413 -> a
+    139:139:void ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):410:410 -> a
+    140:140:boolean lambda$findExistingStaticClinitFieldToTriggerInterfaceInitialization$17(com.android.tools.r8.graph.DexEncodedField):442:442 -> a
+    141:144:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):450:453 -> a
+    145:153:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):452:460 -> a
+    154:154:com.android.tools.r8.graph.FieldAccessFlags$Builder com.android.tools.r8.graph.FieldAccessFlags.builder():48:48 -> a
+    154:154:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):460 -> a
+    155:155:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):460:460 -> a
+    156:159:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):459:462 -> a
+    160:160:boolean lambda$createStaticClinitFieldToTriggerInterfaceInitialization$18(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):456:456 -> a
+    161:161:void createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):469:469 -> a
+    162:164:void createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):468:470 -> a
+    165:165:com.android.tools.r8.cf.CfVersion com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.getInterfaceDesugaredCfVersion(com.android.tools.r8.cf.CfVersion):55:55 -> a
+    165:165:void createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):470 -> a
+    166:166:com.android.tools.r8.utils.structural.Ordered com.android.tools.r8.utils.structural.Ordered.min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> a
+    166:166:com.android.tools.r8.cf.CfVersion com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.getInterfaceDesugaredCfVersion(com.android.tools.r8.cf.CfVersion):55 -> a
+    166:166:void createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):470 -> a
+    167:168:void createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):470:471 -> a
+    169:175:com.android.tools.r8.graph.Code lambda$createCompanionClassInitializer$19(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):473:479 -> a
+    176:181:com.android.tools.r8.graph.Code lambda$createCompanionClassInitializer$19(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):478:483 -> a
+    182:185:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.ensureStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):422:425 -> a
+    182:185:com.android.tools.r8.graph.Code lambda$createCompanionClassInitializer$19(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):486 -> a
+    186:198:com.android.tools.r8.graph.Code lambda$createCompanionClassInitializer$19(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):487:499 -> a
+    199:209:com.android.tools.r8.graph.Code lambda$createCompanionClassInitializer$19(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):492:502 -> a
+    210:216:java.util.function.Predicate getShouldIgnoreFromReportsPredicate(com.android.tools.r8.graph.AppView):507:513 -> a
+    217:218:boolean lambda$getShouldIgnoreFromReportsPredicate$20(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType):514:515 -> a
+    219:219:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):34:34 -> a
+    219:219:boolean lambda$getShouldIgnoreFromReportsPredicate$20(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType):515 -> a
+    220:220:boolean lambda$getShouldIgnoreFromReportsPredicate$20(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType):516:516 -> a
+    221:221:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.isRewrittenEmulatedInterface(com.android.tools.r8.graph.DexType):81:81 -> a
+    221:221:boolean lambda$getShouldIgnoreFromReportsPredicate$20(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType):517 -> a
+    222:224:boolean lambda$getShouldIgnoreFromReportsPredicate$20(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType):517:519 -> a
+    225:225:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):524:524 -> a
+    225:225:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):531 -> a
+    226:226:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):534:534 -> a
     1:1:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> b
-    1:1:com.android.tools.r8.graph.DexClassAndMethod ensureStaticAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):249 -> b
-    2:2:com.android.tools.r8.graph.DexClassAndMethod ensureStaticAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):251:251 -> b
-    3:8:com.android.tools.r8.graph.DexClassAndMethod ensureStaticAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):250:255 -> b
+    1:1:com.android.tools.r8.graph.DexClassAndMethod ensureStaticAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):247 -> b
+    2:2:com.android.tools.r8.graph.DexClassAndMethod ensureStaticAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):249:249 -> b
+    3:8:com.android.tools.r8.graph.DexClassAndMethod ensureStaticAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):248:253 -> b
     void lambda$ensureMethodOfClasspathCompanionClassStub$9(com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder) -> b
-    9:9:com.android.tools.r8.graph.DexType getEmulatedInterface(com.android.tools.r8.graph.DexType):91:91 -> b
-    10:13:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):134:137 -> b
+    9:9:com.android.tools.r8.graph.DexType getEmulatedInterface(com.android.tools.r8.graph.DexType):89:89 -> b
+    10:13:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):132:135 -> b
     14:14:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> b
-    14:14:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):138 -> b
-    15:15:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):135:135 -> b
-    16:17:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):148:149 -> b
-    18:18:java.lang.String com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.getEmulateLibraryInterfaceClassDescriptor(java.lang.String):142:142 -> b
-    18:18:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):150 -> b
-    19:19:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):151:151 -> b
-    20:20:com.android.tools.r8.graph.ProgramMethod ensurePrivateAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):287:287 -> b
-    21:21:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):342:342 -> b
-    21:21:com.android.tools.r8.graph.ProgramMethod ensurePrivateAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):287 -> b
-    22:26:com.android.tools.r8.graph.ProgramMethod ensurePrivateAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):288:292 -> b
-    27:27:com.android.tools.r8.graph.ProgramMethod ensurePrivateAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):289:289 -> b
-    28:28:com.android.tools.r8.graph.Code lambda$ensurePrivateAsMethodOfProgramCompanionClassStub$6(com.android.tools.r8.graph.DexMethod):305:305 -> b
-    29:30:void lambda$ensureMethodOfClasspathCompanionClassStub$11(com.android.tools.r8.synthesis.SyntheticMethodBuilder):363:364 -> b
-    31:40:com.android.tools.r8.graph.ProgramMethod ensureStaticAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):369:378 -> b
-    41:41:com.android.tools.r8.graph.ProgramMethod ensureStaticAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):375:375 -> b
-    42:49:void lambda$ensureStaticAsMethodOfProgramCompanionClassStub$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):381:388 -> b
-    50:50:void lambda$ensureCompanionClassInitializesInterface$15(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):417:417 -> b
-    51:51:boolean lambda$hasStaticMethodThatTriggersNonTrivialClassInitializer$16(com.android.tools.r8.graph.DexEncodedMethod):436:436 -> b
-    52:52:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):444:444 -> b
+    14:14:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):136 -> b
+    15:15:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod):133:133 -> b
+    16:17:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):146:147 -> b
+    18:18:java.lang.String com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.getEmulateLibraryInterfaceClassDescriptor(java.lang.String):140:140 -> b
+    18:18:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):148 -> b
+    19:19:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):149:149 -> b
+    20:20:com.android.tools.r8.graph.ProgramMethod ensurePrivateAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):285:285 -> b
+    21:21:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):340:340 -> b
+    21:21:com.android.tools.r8.graph.ProgramMethod ensurePrivateAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):285 -> b
+    22:26:com.android.tools.r8.graph.ProgramMethod ensurePrivateAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):286:290 -> b
+    27:27:com.android.tools.r8.graph.ProgramMethod ensurePrivateAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod):287:287 -> b
+    28:28:com.android.tools.r8.graph.Code lambda$ensurePrivateAsMethodOfProgramCompanionClassStub$6(com.android.tools.r8.graph.DexMethod):303:303 -> b
+    29:30:void lambda$ensureMethodOfClasspathCompanionClassStub$11(com.android.tools.r8.synthesis.SyntheticMethodBuilder):361:362 -> b
+    31:40:com.android.tools.r8.graph.ProgramMethod ensureStaticAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):367:376 -> b
+    41:41:com.android.tools.r8.graph.ProgramMethod ensureStaticAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):373:373 -> b
+    42:49:void lambda$ensureStaticAsMethodOfProgramCompanionClassStub$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):379:386 -> b
+    50:50:void lambda$ensureCompanionClassInitializesInterface$15(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):415:415 -> b
+    51:51:boolean lambda$hasStaticMethodThatTriggersNonTrivialClassInitializer$16(com.android.tools.r8.graph.DexEncodedMethod):434:434 -> b
+    52:52:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):442:442 -> b
     53:53:java.lang.Iterable com.android.tools.r8.graph.DexClass.staticFields(java.util.function.Predicate):361:361 -> b
-    53:53:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):444 -> b
-    54:54:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):444:444 -> b
+    53:53:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):442 -> b
+    54:54:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):442:442 -> b
     1:1:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> c
-    1:1:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod):238 -> c
-    2:6:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod):239:243 -> c
-    7:7:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):336:336 -> c
-    7:7:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod):243 -> c
-    8:8:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod):244:244 -> c
+    1:1:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod):236 -> c
+    2:6:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod):237:241 -> c
+    7:7:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):334:334 -> c
+    7:7:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod):241 -> c
+    8:8:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod):242:242 -> c
     void lambda$ensureDefaultAsMethodOfProgramCompanionClassStub$5(com.android.tools.r8.graph.ProgramMethod) -> c
-    9:9:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):177:177 -> c
-    10:10:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):182:182 -> c
-    11:11:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.isCompanionClassType(com.android.tools.r8.graph.DexType):168:168 -> c
-    11:11:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):182 -> c
-    12:17:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):182:187 -> c
-    18:18:com.android.tools.r8.graph.Code lambda$ensureStaticAsMethodOfProgramCompanionClassStub$12(com.android.tools.r8.graph.DexMethod):388:388 -> c
-    19:22:boolean hasStaticMethodThatTriggersNonTrivialClassInitializer(com.android.tools.r8.graph.DexProgramClass):433:436 -> c
+    9:9:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):175:175 -> c
+    10:10:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):180:180 -> c
+    11:11:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.isCompanionClassType(com.android.tools.r8.graph.DexType):166:166 -> c
+    11:11:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):180 -> c
+    12:17:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):180:185 -> c
+    18:18:com.android.tools.r8.graph.Code lambda$ensureStaticAsMethodOfProgramCompanionClassStub$12(com.android.tools.r8.graph.DexMethod):386:386 -> c
+    19:22:boolean hasStaticMethodThatTriggersNonTrivialClassInitializer(com.android.tools.r8.graph.DexProgramClass):431:434 -> c
     void lambda$ensurePrivateAsMethodOfProgramCompanionClassStub$8(com.android.tools.r8.graph.ProgramMethod) -> d
-    1:1:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):168:168 -> d
-    2:2:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):346:346 -> d
-    3:3:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):342:342 -> d
-    3:3:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):346 -> d
-    1:1:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):79:79 -> e
-    2:4:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):312:314 -> e
+    1:1:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):166:166 -> d
+    2:2:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):344:344 -> d
+    3:3:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):340:340 -> d
+    3:3:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):344 -> d
+    1:1:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):77:77 -> e
+    2:4:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):310:312 -> e
     5:5:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):302:302 -> e
-    5:5:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):314 -> e
-    1:1:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):526:526 -> f
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer -> com.android.tools.r8.internal.gX0:
+    5:5:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):312 -> e
+    1:1:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):524:524 -> f
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer -> com.android.tools.r8.internal.jX0:
     void acceptCompanionClassClinit(com.android.tools.r8.graph.ProgramMethod) -> a
     void acceptCompanionMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> a
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade -> com.android.tools.r8.internal.hX0:
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade -> com.android.tools.r8.internal.kX0:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List interfaceDesugaringProcessors -> c
     com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor flavour -> b
@@ -83595,7 +83691,7 @@ com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade -> com.androi
     18:18:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):96:96 -> a
     1:3:void processClassesConcurrently(java.util.Collection,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):75:75 -> b
     11:12:void processClassesConcurrently(java.util.Collection,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):83:84 -> b
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter -> com.android.tools.r8.internal.jX0:
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter -> com.android.tools.r8.internal.mX0:
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper helper -> d
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter desugaredLibraryRetargeter -> i
@@ -83609,12 +83705,10 @@ com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter -> com.android.tools
     1:1:void <clinit>():111:111 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.BackportedMethodRewriter,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter):142:142 -> <init>
     2:33:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.BackportedMethodRewriter,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter):118:149 -> <init>
-    34:34:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):153:153 -> <init>
-    35:78:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):118:161 -> <init>
     boolean hasPreciseNeedsDesugaring() -> a
     1:1:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    1:1:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):1030 -> a
-    2:2:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):1030:1030 -> a
+    1:1:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):1013 -> a
+    2:2:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):1013:1013 -> a
     boolean lambda$getPostProcessingDesugaringD8$9(com.android.tools.r8.graph.ProgramMethod) -> a
     3:7:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):165:169 -> a
     8:8:void lambda$checkForAssumedLibraryTypes$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexString,java.util.Map):169:169 -> a
@@ -83631,216 +83725,208 @@ com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter -> com.android.tools
     33:33:void addCompanionClassRewriteRule(com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.AppView):235:235 -> a
     34:51:boolean invokeNeedsRewriting(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):254:271 -> a
     52:56:boolean invokeNeedsRewriting(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):255:259 -> a
-    57:59:boolean isAlreadyRewritten(com.android.tools.r8.graph.DexMethod,boolean,boolean,com.android.tools.r8.graph.ProgramMethod):282:284 -> a
-    60:65:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):386:391 -> a
-    66:73:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):388:395 -> a
-    74:74:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):576:576 -> a
-    74:74:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.needsRewriting(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):247 -> a
-    74:74:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):395 -> a
-    75:75:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.needsRewriting(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):248:248 -> a
-    75:75:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):395 -> a
-    76:76:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):409:409 -> a
-    77:77:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):576:576 -> a
-    77:77:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):409 -> a
-    78:82:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):412:416 -> a
-    83:135:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):413:465 -> a
-    136:149:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):463:476 -> a
-    150:150:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):788:788 -> a
-    150:150:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):475 -> a
-    151:151:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):35:35 -> a
-    151:151:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):788 -> a
-    151:151:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):475 -> a
-    152:158:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):793:799 -> a
-    152:158:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):475 -> a
-    159:159:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.shouldRewriteToInvokeToThrow(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,boolean):937:937 -> a
-    159:159:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):799 -> a
-    159:159:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):475 -> a
-    160:164:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):800:804 -> a
-    160:164:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):475 -> a
-    165:165:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    165:165:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):804 -> a
-    165:165:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):475 -> a
-    166:172:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):814:820 -> a
-    166:172:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):475 -> a
-    173:173:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    173:173:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):822 -> a
-    173:173:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):475 -> a
-    174:187:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):823:836 -> a
-    174:187:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):475 -> a
-    188:190:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):1053:1055 -> a
-    188:190:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):836 -> a
-    188:190:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):475 -> a
-    191:197:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):837:843 -> a
-    191:197:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):475 -> a
-    198:198:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):842:842 -> a
-    198:198:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):475 -> a
-    199:209:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):841:851 -> a
-    199:209:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):475 -> a
-    210:210:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):566:566 -> a
-    210:210:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):851 -> a
-    210:210:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):475 -> a
-    211:213:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):852:854 -> a
-    211:213:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):475 -> a
-    214:214:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    57:60:boolean isAlreadyDesugared(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):280:283 -> a
+    61:66:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):381:386 -> a
+    67:67:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):558:558 -> a
+    67:67:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.needsRewriting(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):247 -> a
+    67:67:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):386 -> a
+    68:68:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.needsRewriting(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):248:248 -> a
+    68:68:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):386 -> a
+    69:69:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):400:400 -> a
+    70:70:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):558:558 -> a
+    70:70:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):400 -> a
+    71:130:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):403:462 -> a
+    131:131:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):771:771 -> a
+    131:131:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):461 -> a
+    132:132:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):35:35 -> a
+    132:132:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):771 -> a
+    132:132:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):461 -> a
+    133:139:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):776:782 -> a
+    133:139:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):461 -> a
+    140:140:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.shouldRewriteToInvokeToThrow(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,boolean):920:920 -> a
+    140:140:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):782 -> a
+    140:140:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):461 -> a
+    141:145:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):783:787 -> a
+    141:145:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):461 -> a
+    146:146:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    146:146:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):787 -> a
+    146:146:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):461 -> a
+    147:153:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):797:803 -> a
+    147:153:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):461 -> a
+    154:154:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    154:154:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):805 -> a
+    154:154:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):461 -> a
+    155:168:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):806:819 -> a
+    155:168:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):461 -> a
+    169:171:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):1036:1038 -> a
+    169:171:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):819 -> a
+    169:171:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):461 -> a
+    172:178:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):820:826 -> a
+    172:178:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):461 -> a
+    179:179:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):825:825 -> a
+    179:179:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):461 -> a
+    180:190:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):824:834 -> a
+    180:190:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):461 -> a
+    191:191:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):566:566 -> a
+    191:191:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):834 -> a
+    191:191:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):461 -> a
+    192:194:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):835:837 -> a
+    192:194:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):461 -> a
+    195:195:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    195:195:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):837 -> a
+    195:195:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):461 -> a
+    196:212:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):837:853 -> a
+    196:212:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):461 -> a
+    213:213:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):566:566 -> a
+    213:213:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):853 -> a
+    213:213:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):461 -> a
+    214:214:boolean com.android.tools.r8.graph.Definition.isLibraryMethod():0:0 -> a
     214:214:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):854 -> a
-    214:214:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):475 -> a
-    215:231:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):854:870 -> a
-    215:231:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):475 -> a
-    232:232:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):566:566 -> a
-    232:232:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):870 -> a
-    232:232:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):475 -> a
-    233:233:boolean com.android.tools.r8.graph.Definition.isLibraryMethod():0:0 -> a
-    233:233:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):871 -> a
-    233:233:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):475 -> a
-    234:251:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):872:889 -> a
-    234:251:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):475 -> a
-    252:252:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):478:478 -> a
-    253:269:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):437:453 -> a
-    270:273:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.graph.DexMethod,boolean,java.util.function.Function,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):926:929 -> a
-    270:273:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):452 -> a
-    274:274:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.graph.DexMethod,boolean,java.util.function.Function,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):928:928 -> a
-    274:274:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):452 -> a
-    275:275:java.util.Collection lambda$desugarInstruction$4(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult):428:428 -> a
-    276:277:void lambda$desugarInstruction$5(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):458:459 -> a
-    278:280:java.util.Collection rewriteInvokeToThrowCf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):489:491 -> a
-    281:319:java.util.Collection rewriteInvokeToThrowCf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):488:526 -> a
-    320:320:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():77:77 -> a
-    320:320:java.util.Collection rewriteInvokeToThrowCf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):526 -> a
-    321:326:java.util.Collection rewriteInvokeToThrowCf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):527:532 -> a
-    327:349:java.util.Collection rewriteInvokeToThrowCf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):528:550 -> a
-    350:357:java.util.Collection rewriteInvokeToThrowCf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):547:554 -> a
-    358:358:java.util.Collection rewriteInvokeToThrowCf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):504:504 -> a
-    359:359:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):576:576 -> a
-    359:359:boolean needsRewriting(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):247 -> a
-    360:360:boolean needsRewriting(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):248:248 -> a
-    361:361:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):576:576 -> a
-    361:361:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):298 -> a
-    362:367:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):299:304 -> a
-    368:368:boolean com.android.tools.r8.cf.code.CfInstruction.isInvokeDynamic():0:0 -> a
-    368:368:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):304 -> a
-    369:372:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):304:307 -> a
-    373:375:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):306:308 -> a
-    376:378:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):582:584 -> a
-    376:378:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):308 -> a
-    379:379:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
-    379:379:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):584 -> a
-    379:379:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):308 -> a
-    380:380:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):585:585 -> a
-    380:380:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):308 -> a
-    381:386:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):311:316 -> a
-    387:394:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):313:320 -> a
-    395:396:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.scanInvokeStatic(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):346:347 -> a
-    395:396:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):321 -> a
-    397:397:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):35:35 -> a
-    397:397:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.scanInvokeStatic(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):347 -> a
-    397:397:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):321 -> a
-    398:425:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.scanInvokeStatic(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):352:379 -> a
-    398:425:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):321 -> a
-    426:426:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):322:322 -> a
-    427:427:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.scanInvokeDirectOrSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):330:330 -> a
-    427:427:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):323 -> a
-    428:428:boolean com.android.tools.r8.cf.code.CfInvoke.isInvokeConstructor(com.android.tools.r8.graph.DexItemFactory):173:173 -> a
-    428:428:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.scanInvokeDirectOrSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):330 -> a
-    428:428:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):323 -> a
-    429:429:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):285:285 -> a
-    429:429:boolean com.android.tools.r8.cf.code.CfInvoke.isInvokeConstructor(com.android.tools.r8.graph.DexItemFactory):173 -> a
-    429:429:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.scanInvokeDirectOrSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):330 -> a
-    429:429:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):323 -> a
-    430:431:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.scanInvokeDirectOrSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):333:334 -> a
-    430:431:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):323 -> a
-    432:432:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):35:35 -> a
-    432:432:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.scanInvokeDirectOrSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):334 -> a
-    432:432:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):323 -> a
-    433:433:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.scanInvokeDirectOrSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):341:341 -> a
-    433:433:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):323 -> a
-    434:438:java.util.Collection rewriteInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):595:599 -> a
-    439:439:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):67:67 -> a
-    439:439:java.util.Collection rewriteInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):599 -> a
-    440:444:java.util.Collection rewriteInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):602:606 -> a
-    445:445:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    445:445:java.util.Collection rewriteInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):610 -> a
-    446:454:java.util.Collection rewriteInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):618:626 -> a
-    455:455:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    455:455:java.util.Collection rewriteInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):627 -> a
-    456:458:java.util.Collection rewriteInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):628:630 -> a
-    459:488:java.util.Collection rewriteInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):629:658 -> a
-    489:493:java.util.Collection rewriteInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):611:615 -> a
-    494:494:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    494:494:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    494:494:java.util.Collection rewriteInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):615 -> a
-    495:495:java.util.Collection rewriteInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):615:615 -> a
-    496:496:void acceptCompanionMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):668:668 -> a
-    497:497:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    497:497:void acceptCompanionMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):668 -> a
-    498:498:void acceptCompanionMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):668:668 -> a
-    499:499:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    499:499:void acceptCompanionMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):669 -> a
-    500:500:void acceptCompanionMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):670:670 -> a
-    501:506:java.util.Collection rewriteInvokeStatic(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):683:688 -> a
-    507:507:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):35:35 -> a
-    507:507:java.util.Collection rewriteInvokeStatic(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):688 -> a
-    508:552:java.util.Collection rewriteInvokeStatic(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):694:738 -> a
-    553:585:java.util.Collection rewriteInvokeStatic(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):736:768 -> a
-    586:586:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.shouldRewriteToInvokeToThrow(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,boolean):937:937 -> a
-    586:586:java.util.Collection rewriteInvokeStatic(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):768 -> a
-    587:597:java.util.Collection rewriteInvokeStatic(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):769:779 -> a
-    598:601:void lambda$rewriteInvokeStatic$7(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):741:744 -> a
-    602:605:com.android.tools.r8.graph.Code lambda$rewriteInvokeStatic$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):746:749 -> a
-    606:615:com.android.tools.r8.graph.DexClassAndMethod defaultMethodForEmulatedDispatchOrNull(com.android.tools.r8.graph.DexMethod,boolean):896:905 -> a
-    616:617:com.android.tools.r8.graph.MethodResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):613:614 -> a
-    616:617:com.android.tools.r8.graph.DexClassAndMethod defaultMethodForEmulatedDispatchOrNull(com.android.tools.r8.graph.DexMethod,boolean):905 -> a
-    618:620:com.android.tools.r8.graph.DexClassAndMethod defaultMethodForEmulatedDispatchOrNull(com.android.tools.r8.graph.DexMethod,boolean):906:908 -> a
-    621:621:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    621:621:com.android.tools.r8.graph.DexClassAndMethod defaultMethodForEmulatedDispatchOrNull(com.android.tools.r8.graph.DexMethod,boolean):908 -> a
-    622:627:com.android.tools.r8.graph.DexClassAndMethod defaultMethodForEmulatedDispatchOrNull(com.android.tools.r8.graph.DexMethod,boolean):908:913 -> a
-    628:637:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):1034:1043 -> a
-    638:638:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getPostProcessingDesugaringD8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor):1060:1060 -> a
-    639:639:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getPostProcessingDesugaringR8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.function.Predicate,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):1067:1067 -> a
-    640:645:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1071:1076 -> a
-    646:646:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():760:760 -> a
-    646:646:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1076 -> a
-    647:647:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1081:1081 -> a
-    648:673:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1092:1117 -> a
-    648:673:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1085 -> a
-    674:674:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    674:674:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1117 -> a
-    674:674:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1085 -> a
-    675:695:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1118:1138 -> a
-    675:695:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1085 -> a
-    696:696:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1086:1086 -> a
-    697:701:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1099:1103 -> a
-    697:701:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1085 -> a
-    702:702:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    702:702:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1103 -> a
-    702:702:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1085 -> a
-    703:703:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1103:1103 -> a
-    703:703:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1085 -> a
-    704:710:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1144:1150 -> a
-    711:711:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1155:1155 -> a
-    712:712:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    712:712:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1155 -> a
-    713:714:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1155:1156 -> a
-    715:715:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    715:715:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1156 -> a
-    716:717:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1156:1157 -> a
-    718:718:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():760:760 -> a
-    718:718:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1159 -> a
-    719:720:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1161:1162 -> a
-    721:721:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():760:760 -> a
-    721:721:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1174 -> a
-    721:721:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1163 -> a
-    722:722:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1176:1176 -> a
-    722:722:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1163 -> a
-    723:724:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1165:1166 -> a
-    725:725:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():760:760 -> a
-    725:725:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1174 -> a
-    725:725:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1166 -> a
-    726:726:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1176:1176 -> a
-    726:726:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1166 -> a
+    214:214:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):461 -> a
+    215:232:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):855:872 -> a
+    215:232:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):461 -> a
+    233:233:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):464:464 -> a
+    234:250:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):424:440 -> a
+    251:254:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.graph.DexMethod,boolean,java.util.function.Function,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):909:912 -> a
+    251:254:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):439 -> a
+    255:255:java.util.Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.rewriteInvokeInterfaceOrInvokeVirtual(com.android.tools.r8.graph.DexMethod,boolean,java.util.function.Function,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):911:911 -> a
+    255:255:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):439 -> a
+    256:256:java.util.Collection lambda$desugarInstruction$4(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult):415:415 -> a
+    257:258:void lambda$desugarInstruction$5(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):445:446 -> a
+    259:293:java.util.Collection rewriteInvokeToThrowCf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):474:508 -> a
+    294:294:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():77:77 -> a
+    294:294:java.util.Collection rewriteInvokeToThrowCf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):508 -> a
+    295:300:java.util.Collection rewriteInvokeToThrowCf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):509:514 -> a
+    301:323:java.util.Collection rewriteInvokeToThrowCf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):510:532 -> a
+    324:331:java.util.Collection rewriteInvokeToThrowCf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):529:536 -> a
+    332:332:java.util.Collection rewriteInvokeToThrowCf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):486:486 -> a
+    333:333:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):558:558 -> a
+    333:333:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):297 -> a
+    334:339:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):298:303 -> a
+    340:340:boolean com.android.tools.r8.cf.code.CfInstruction.isInvokeDynamic():0:0 -> a
+    340:340:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):303 -> a
+    341:344:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):303:306 -> a
+    345:347:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):305:307 -> a
+    348:350:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):564:566 -> a
+    348:350:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):307 -> a
+    351:351:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
+    351:351:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):566 -> a
+    351:351:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):307 -> a
+    352:352:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportInterfaceMethodHandleCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):567:567 -> a
+    352:352:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):307 -> a
+    353:358:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):310:315 -> a
+    359:360:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.scanInvokeStatic(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):341:342 -> a
+    359:360:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):316 -> a
+    361:361:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):35:35 -> a
+    361:361:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.scanInvokeStatic(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):342 -> a
+    361:361:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):316 -> a
+    362:389:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.scanInvokeStatic(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):347:374 -> a
+    362:389:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):316 -> a
+    390:390:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):317:317 -> a
+    391:391:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.scanInvokeDirectOrSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):325:325 -> a
+    391:391:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):318 -> a
+    392:392:boolean com.android.tools.r8.cf.code.CfInvoke.isInvokeConstructor(com.android.tools.r8.graph.DexItemFactory):173:173 -> a
+    392:392:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.scanInvokeDirectOrSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):325 -> a
+    392:392:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):318 -> a
+    393:393:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):285:285 -> a
+    393:393:boolean com.android.tools.r8.cf.code.CfInvoke.isInvokeConstructor(com.android.tools.r8.graph.DexItemFactory):173 -> a
+    393:393:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.scanInvokeDirectOrSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):325 -> a
+    393:393:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):318 -> a
+    394:395:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.scanInvokeDirectOrSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):328:329 -> a
+    394:395:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):318 -> a
+    396:396:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):35:35 -> a
+    396:396:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.scanInvokeDirectOrSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):329 -> a
+    396:396:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):318 -> a
+    397:397:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.scanInvokeDirectOrSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):336:336 -> a
+    397:397:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):318 -> a
+    398:402:java.util.Collection rewriteInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):577:581 -> a
+    403:403:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):67:67 -> a
+    403:403:java.util.Collection rewriteInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):581 -> a
+    404:408:java.util.Collection rewriteInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):584:588 -> a
+    409:409:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    409:409:java.util.Collection rewriteInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):592 -> a
+    410:418:java.util.Collection rewriteInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):600:608 -> a
+    419:419:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    419:419:java.util.Collection rewriteInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):609 -> a
+    420:422:java.util.Collection rewriteInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):610:612 -> a
+    423:452:java.util.Collection rewriteInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):611:640 -> a
+    453:457:java.util.Collection rewriteInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):593:597 -> a
+    458:458:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    458:458:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    458:458:java.util.Collection rewriteInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):597 -> a
+    459:459:java.util.Collection rewriteInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):597:597 -> a
+    460:460:void acceptCompanionMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):650:650 -> a
+    461:461:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    461:461:void acceptCompanionMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):650 -> a
+    462:462:void acceptCompanionMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):650:650 -> a
+    463:463:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    463:463:void acceptCompanionMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):651 -> a
+    464:464:void acceptCompanionMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer):652:652 -> a
+    465:472:java.util.Collection rewriteInvokeStatic(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):664:671 -> a
+    473:473:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):35:35 -> a
+    473:473:java.util.Collection rewriteInvokeStatic(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):671 -> a
+    474:518:java.util.Collection rewriteInvokeStatic(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):677:721 -> a
+    519:551:java.util.Collection rewriteInvokeStatic(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):719:751 -> a
+    552:552:boolean com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.shouldRewriteToInvokeToThrow(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,boolean):920:920 -> a
+    552:552:java.util.Collection rewriteInvokeStatic(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):751 -> a
+    553:563:java.util.Collection rewriteInvokeStatic(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer,java.util.function.Function,java.util.function.Function,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):752:762 -> a
+    564:567:void lambda$rewriteInvokeStatic$7(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):724:727 -> a
+    568:571:com.android.tools.r8.graph.Code lambda$rewriteInvokeStatic$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):729:732 -> a
+    572:581:com.android.tools.r8.graph.DexClassAndMethod defaultMethodForEmulatedDispatchOrNull(com.android.tools.r8.graph.DexMethod,boolean):879:888 -> a
+    582:583:com.android.tools.r8.graph.MethodResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):613:614 -> a
+    582:583:com.android.tools.r8.graph.DexClassAndMethod defaultMethodForEmulatedDispatchOrNull(com.android.tools.r8.graph.DexMethod,boolean):888 -> a
+    584:586:com.android.tools.r8.graph.DexClassAndMethod defaultMethodForEmulatedDispatchOrNull(com.android.tools.r8.graph.DexMethod,boolean):889:891 -> a
+    587:587:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    587:587:com.android.tools.r8.graph.DexClassAndMethod defaultMethodForEmulatedDispatchOrNull(com.android.tools.r8.graph.DexMethod,boolean):891 -> a
+    588:593:com.android.tools.r8.graph.DexClassAndMethod defaultMethodForEmulatedDispatchOrNull(com.android.tools.r8.graph.DexMethod,boolean):891:896 -> a
+    594:603:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):1017:1026 -> a
+    604:604:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getPostProcessingDesugaringD8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor):1043:1043 -> a
+    605:605:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getPostProcessingDesugaringR8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.function.Predicate,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):1050:1050 -> a
+    606:611:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1054:1059 -> a
+    612:612:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():760:760 -> a
+    612:612:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1059 -> a
+    613:613:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1064:1064 -> a
+    614:639:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1075:1100 -> a
+    614:639:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1068 -> a
+    640:640:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    640:640:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1100 -> a
+    640:640:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1068 -> a
+    641:661:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1101:1121 -> a
+    641:661:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1068 -> a
+    662:662:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1069:1069 -> a
+    663:667:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1082:1086 -> a
+    663:667:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1068 -> a
+    668:668:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    668:668:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1086 -> a
+    668:668:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1068 -> a
+    669:669:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1086:1086 -> a
+    669:669:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1068 -> a
+    670:676:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1127:1133 -> a
+    677:677:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1138:1138 -> a
+    678:678:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    678:678:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1138 -> a
+    679:680:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1138:1139 -> a
+    681:681:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    681:681:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1139 -> a
+    682:683:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1139:1140 -> a
+    684:684:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():760:760 -> a
+    684:684:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1142 -> a
+    685:686:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1144:1145 -> a
+    687:687:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():760:760 -> a
+    687:687:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1157 -> a
+    687:687:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1146 -> a
+    688:688:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1159:1159 -> a
+    688:688:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1146 -> a
+    689:690:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1148:1149 -> a
+    691:691:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():760:760 -> a
+    691:691:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1157 -> a
+    691:691:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1149 -> a
+    692:692:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1159:1159 -> a
+    692:692:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):1149 -> a
     1:1:java.util.Set getEmulatedMethods():198:198 -> b
-    2:2:java.util.Collection lambda$desugarInstruction$3(com.android.tools.r8.graph.DexMethod):423:423 -> b
-    3:7:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):565:569 -> b
-    8:11:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):568:571 -> b
+    2:2:java.util.Collection lambda$desugarInstruction$3(com.android.tools.r8.graph.DexMethod):410:410 -> b
+    3:7:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):547:551 -> b
+    8:11:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):550:553 -> b
     1:5:void initializeEmulatedInterfaceVariables():202:206 -> c
     6:6:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addCompanionClassRewriteRule(com.android.tools.r8.graph.DexType,java.lang.String):230:230 -> c
     6:6:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addRewriteRulesForEmulatedInterface(com.android.tools.r8.graph.DexType,java.lang.String):219 -> c
@@ -83852,13 +83938,13 @@ com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter -> com.android.tools
     13:13:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.addRewriteRulesForEmulatedInterface(com.android.tools.r8.graph.DexType,java.lang.String):220:220 -> c
     13:13:void initializeEmulatedInterfaceVariables():205 -> c
     14:18:void initializeEmulatedInterfaceVariables():207:211 -> c
-    19:46:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):997:1024 -> c
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.internal.iX0:
+    19:46:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):980:1007 -> c
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.internal.lX0:
     com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor ExcludeDexResources -> b
     com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor IncludeAllResources -> a
     1:3:void <clinit>():133:135 -> <clinit>
     1:1:void <init>(java.lang.String,int):131:131 -> <init>
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriterFixup -> com.android.tools.r8.internal.kX0:
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriterFixup -> com.android.tools.r8.internal.nX0:
     com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens graphLens -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens):17:19 -> <init>
@@ -83875,7 +83961,7 @@ com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriterFixup -> com.android.
     20:20:com.android.tools.r8.graph.EnclosingMethodAttribute com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriterFixup.fixupEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):44:44 -> a
     20:20:void run():33 -> a
     21:21:void run():32:32 -> a
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor -> com.android.tools.r8.internal.oX0:
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor -> com.android.tools.r8.internal.rX0:
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper helper -> b
     java.util.Map postProcessingInterfaceInfos -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -83902,7 +83988,7 @@ com.android.tools.r8.ir.desugar.itf.InterfaceProcessor -> com.android.tools.r8.i
     39:50:boolean com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.canMoveToCompanionClass(com.android.tools.r8.graph.ProgramMethod):212:223 -> a
     39:50:void finalizeMoveToCompanionMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):162 -> a
     51:54:void finalizeMoveToCompanionMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):169:172 -> a
-    55:55:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():485:485 -> a
+    55:55:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():427:427 -> a
     55:55:void finalizeMoveToCompanionMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):172 -> a
     56:70:void finalizeMoveToCompanionMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):172:186 -> a
     71:86:void finalizeMoveToCompanionMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):180:195 -> a
@@ -83944,7 +84030,7 @@ com.android.tools.r8.ir.desugar.itf.InterfaceProcessor -> com.android.tools.r8.i
     2:2:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens postProcessInterfaces():277 -> b
     3:29:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens postProcessInterfaces():278:304 -> b
     30:30:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo lambda$getPostProcessingInterfaceInfo$3(com.android.tools.r8.graph.DexProgramClass):340:340 -> b
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens -> com.android.tools.r8.internal.mX0:
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens -> com.android.tools.r8.internal.pX0:
     int $r8$clinit -> o
     com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap extraNewMethodSignatures -> n
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap):420:421 -> <init>
@@ -83963,12 +84049,12 @@ com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedG
     4:4:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):442 -> g
     5:5:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):442:442 -> g
     1:1:com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap getExtraNewMethodSignatures():426:426 -> l
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder -> com.android.tools.r8.internal.lX0:
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder -> com.android.tools.r8.internal.oX0:
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap extraNewMethodSignatures -> d
     1:3:void <init>():450:452 -> <init>
     1:4:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens build(com.android.tools.r8.graph.AppView):461:464 -> a
     1:1:void recordCodeMovedToCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):456:456 -> b
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo -> com.android.tools.r8.internal.nX0:
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo -> com.android.tools.r8.internal.qX0:
     java.util.Map defaultMethodsToImplementation -> a
     java.util.Map methodsToMove -> b
     boolean hasNonClinitDirectMethods -> c
@@ -83985,7 +84071,7 @@ com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceIn
     1:1:boolean hasNonClinitDirectMethods():390:390 -> f
     1:1:void setHasBridgesToRemove():402:402 -> g
     1:1:void setHasNonClinitDirectMethods():394:394 -> h
-com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer -> com.android.tools.r8.internal.rf1:
+com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer -> com.android.tools.r8.internal.uf1:
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper helper -> b
     java.util.Map emulatedInterfacesHierarchy -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -84041,7 +84127,7 @@ com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer -> com.a
     111:118:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.synthesizeCfCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):148:155 -> a
     111:118:com.android.tools.r8.graph.Code lambda$synthesizeEmulatedInterfaceMethod$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):135 -> a
     119:119:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):230:230 -> a
-    120:120:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
+    120:120:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
     120:120:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):230 -> a
     121:132:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):230:241 -> a
     133:138:void com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):251:256 -> a
@@ -84053,15 +84139,15 @@ com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer -> com.a
     11:11:void synthesizeEmulateInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121:121 -> b
     12:12:void synthesizeEmulateInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):120:120 -> b
     13:19:void synthesizeEmulatedInterfaceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):127:133 -> b
-com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer -> com.android.tools.r8.internal.NP0:
+com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer -> com.android.tools.r8.internal.QP0:
     void lambda$emptyForcefullyMovedLambdaMethodConsumer$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod) -> a
     1:1:com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer emptyForcefullyMovedLambdaMethodConsumer():14:14 -> a
     void acceptForcefullyMovedLambdaMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod) -> b
-com.android.tools.r8.ir.desugar.lambda.LambdaDeserializationMethodRemover -> com.android.tools.r8.internal.f41:
+com.android.tools.r8.ir.desugar.lambda.LambdaDeserializationMethodRemover -> com.android.tools.r8.internal.i41:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:4:void run(com.android.tools.r8.graph.AppView,java.util.Collection):24:27 -> a
-com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring -> com.android.tools.r8.internal.g41:
+com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring -> com.android.tools.r8.internal.j41:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set directTargetedLambdaImplementationMethods -> b
     1:1:void <init>(com.android.tools.r8.graph.AppView):53:53 -> <init>
@@ -84077,7 +84163,7 @@ com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring -> com.androi
     12:12:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):81:81 -> a
     13:13:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):80:80 -> a
     14:29:java.util.Collection desugarInvokeDynamicInstruction(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.lambda.LambdaDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):98:113 -> a
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaClass.getType():122:122 -> a
+    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaClass.getType():118:118 -> a
     30:30:java.util.Collection desugarInvokeDynamicInstruction(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.lambda.LambdaDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):113 -> a
     31:46:java.util.Collection desugarInvokeDynamicInstruction(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.lambda.LambdaDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):113:128 -> a
     47:50:void lambda$desugarInvokeDynamicInstruction$0(com.android.tools.r8.ir.desugar.FreshLocalProvider,java.util.Deque,com.android.tools.r8.graph.DexType):117:120 -> a
@@ -84099,24 +84185,24 @@ com.android.tools.r8.ir.desugar.nest.AccessBridgeFactory -> com.android.tools.r8
     22:22:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder com.android.tools.r8.ir.synthetic.FieldAccessorBuilder.applyIf(boolean,java.util.function.Consumer,java.util.function.Consumer):47 -> a
     22:22:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):34 -> a
     23:25:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):36:38 -> a
-    26:35:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):32:41 -> a
-    36:36:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.graph.DexEncodedField.getApiLevel():141:141 -> a
-    36:36:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):41 -> a
-    37:38:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):41:42 -> a
-    39:39:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.graph.DexEncodedField.getApiLevel():141:141 -> a
-    39:39:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):42 -> a
-    40:41:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):42:43 -> a
-    42:55:com.android.tools.r8.graph.ProgramMethod createInitializerAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):48:61 -> a
-    56:65:com.android.tools.r8.graph.ProgramMethod createInitializerAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):57:66 -> a
-    66:66:void lambda$createMethodAccessorBridge$0(com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):90:90 -> a
-    1:14:com.android.tools.r8.graph.ProgramMethod createMethodAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):71:84 -> b
-    15:26:com.android.tools.r8.graph.ProgramMethod createMethodAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):78:89 -> b
+    26:34:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):32:40 -> a
+    35:35:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.graph.DexEncodedField.getApiLevel():107:107 -> a
+    35:35:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):40 -> a
+    36:37:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):40:41 -> a
+    38:38:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.graph.DexEncodedField.getApiLevel():107:107 -> a
+    38:38:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):41 -> a
+    39:40:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):41:42 -> a
+    41:54:com.android.tools.r8.graph.ProgramMethod createInitializerAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):47:60 -> a
+    55:63:com.android.tools.r8.graph.ProgramMethod createInitializerAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):56:64 -> a
+    64:64:void lambda$createMethodAccessorBridge$0(com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):88:88 -> a
+    1:14:com.android.tools.r8.graph.ProgramMethod createMethodAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):69:82 -> b
+    15:26:com.android.tools.r8.graph.ProgramMethod createMethodAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):76:87 -> b
     27:29:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.applyIf(boolean,java.util.function.Consumer,java.util.function.Consumer):76:78 -> b
-    27:29:com.android.tools.r8.graph.ProgramMethod createMethodAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):88 -> b
-    30:30:com.android.tools.r8.graph.ProgramMethod createMethodAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):92:92 -> b
-    31:43:com.android.tools.r8.graph.ProgramMethod createMethodAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):85:97 -> b
-    44:44:void lambda$createMethodAccessorBridge$1(com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):91:91 -> b
-com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring -> com.android.tools.r8.internal.SJ0:
+    27:29:com.android.tools.r8.graph.ProgramMethod createMethodAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):86 -> b
+    30:30:com.android.tools.r8.graph.ProgramMethod createMethodAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):90:90 -> b
+    31:42:com.android.tools.r8.graph.ProgramMethod createMethodAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):83:94 -> b
+    43:43:void lambda$createMethodAccessorBridge$1(com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):89:89 -> b
+com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring -> com.android.tools.r8.internal.VJ0:
     1:1:void <init>(com.android.tools.r8.graph.AppView):36:36 -> <init>
     void lambda$clearNestAttributes$3(com.android.tools.r8.graph.DexClass) -> a
     1:2:void lambda$clearNestAttributes$2(com.android.tools.r8.ir.desugar.nest.Nest):61:62 -> a
@@ -84143,32 +84229,32 @@ com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring -> com.android.
     1:8:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):42:49 -> b
     9:9:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):43:43 -> b
     10:10:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54:54 -> b
-    11:11:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):887:887 -> b
+    11:11:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):893:893 -> b
     11:11:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
     12:12:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():760:760 -> b
-    12:12:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):889 -> b
+    12:12:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):895 -> b
     12:12:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-    13:13:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):889:889 -> b
+    13:13:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):895:895 -> b
     13:13:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-    14:16:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):893:895 -> b
-    14:16:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):889 -> b
+    14:16:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):899:901 -> b
+    14:16:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):895 -> b
     14:16:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-    17:17:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):889:889 -> b
+    17:17:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):895:895 -> b
     17:17:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-    18:18:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):887:887 -> b
+    18:18:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):893:893 -> b
     18:18:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
     19:19:void clearNestAttributes():59:59 -> b
     1:1:void reportDesugarDependencies():40:40 -> c
-com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$1 -> com.android.tools.r8.internal.QJ0:
+com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$1 -> com.android.tools.r8.internal.TJ0:
     com.android.tools.r8.ir.conversion.MethodProcessor val$methodProcessor -> a
     1:1:void <init>(com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring,com.android.tools.r8.ir.conversion.MethodProcessor):81:81 -> <init>
     1:1:void acceptNestFieldGetBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):85:85 -> a
     1:1:void acceptNestFieldPutBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):90:90 -> b
     2:2:void acceptNestMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):95:95 -> b
-com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.internal.RJ0:
-    com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring this$0 -> e
-    com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer eventConsumer -> c
-    com.android.tools.r8.graph.ClasspathMethod context -> d
+com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.internal.UJ0:
+    com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring this$0 -> f
+    com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer eventConsumer -> d
+    com.android.tools.r8.graph.ClasspathMethod context -> e
     1:4:void <init>(com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring,com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):118:121 -> <init>
     1:2:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):125:126 -> a
     3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
@@ -84191,7 +84277,7 @@ com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$NestBasedAccess
     7:9:void registerInvoke(com.android.tools.r8.graph.DexMethod):137:139 -> f
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> g
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):185:185 -> g
-com.android.tools.r8.ir.desugar.nest.Nest -> com.android.tools.r8.internal.u91:
+com.android.tools.r8.ir.desugar.nest.Nest -> com.android.tools.r8.internal.x91:
     com.android.tools.r8.graph.DexClass hostClass -> a
     java.util.List members -> b
     java.util.List missingMembers -> c
@@ -84205,7 +84291,7 @@ com.android.tools.r8.ir.desugar.nest.Nest -> com.android.tools.r8.internal.u91:
     1:1:java.util.List getMembers():69:69 -> c
     1:1:java.util.List getMissingMembers():73:73 -> d
     1:1:boolean hasMissingMembers():81:81 -> e
-com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring -> com.android.tools.r8.internal.w91:
+com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring -> com.android.tools.r8.internal.z91:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.util.Map syntheticNestConstructorTypes -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -84238,7 +84324,7 @@ com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring -> com.android.to
     void lambda$getMethodBridgeReference$4(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder) -> a
     52:52:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring create(com.android.tools.r8.graph.AppView):77:77 -> a
     53:53:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1719:1719 -> a
-    53:53:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():514 -> a
+    53:53:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():520 -> a
     53:53:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring create(com.android.tools.r8.graph.AppView):77 -> a
     54:56:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring create(com.android.tools.r8.graph.AppView):78:80 -> a
     57:65:void forEachNest(java.util.function.Consumer,java.util.function.Consumer):90:98 -> a
@@ -84335,7 +84421,7 @@ com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring -> com.android.to
     292:292:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$5(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):451 -> a
     293:298:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$5(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):451:456 -> a
     299:303:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$5(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):454:458 -> a
-com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget -> com.android.tools.r8.internal.v91:
+com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget -> com.android.tools.r8.internal.y91:
     com.android.tools.r8.graph.DexClassAndMember target -> b
     com.android.tools.r8.graph.DexMethod bridge -> a
     boolean $assertionsDisabled -> c
@@ -84344,11 +84430,11 @@ com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget -
     1:1:com.android.tools.r8.graph.DexMethod getBridge():114:114 -> a
     1:1:com.android.tools.r8.graph.DexClassAndMember getTarget():118:118 -> b
     1:1:boolean shouldAddBridge():122:122 -> c
-com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer -> com.android.tools.r8.internal.x91:
+com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer -> com.android.tools.r8.internal.A91:
     void acceptNestFieldGetBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod) -> a
     void acceptNestFieldPutBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod) -> b
     void acceptNestMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> b
-com.android.tools.r8.ir.desugar.records.RecordCfMethods -> com.android.tools.r8.internal.Di1:
+com.android.tools.r8.ir.desugar.records.RecordCfMethods -> com.android.tools.r8.internal.Bi1:
     1:17:com.android.tools.r8.graph.CfCode RecordMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):52:68 -> a
     18:21:com.android.tools.r8.graph.CfCode RecordMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):66:69 -> a
     22:36:com.android.tools.r8.graph.CfCode RecordMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):64:78 -> a
@@ -84385,134 +84471,134 @@ com.android.tools.r8.ir.desugar.records.RecordCfMethods -> com.android.tools.r8.
     269:283:com.android.tools.r8.graph.CfCode RecordMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):291:305 -> b
     284:284:com.android.tools.r8.graph.CfCode RecordMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):302:302 -> b
     285:489:com.android.tools.r8.graph.CfCode RecordMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):106:310 -> b
-com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer -> com.android.tools.r8.internal.Hi1:
+com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer -> com.android.tools.r8.internal.Fi1:
     void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass) -> a
-com.android.tools.r8.ir.desugar.records.RecordRewriter -> com.android.tools.r8.internal.Ki1:
+com.android.tools.r8.ir.desugar.records.RecordRewriter -> com.android.tools.r8.internal.Ii1:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexProto recordToStringHelperProto -> c
     com.android.tools.r8.graph.DexProto recordHashCodeHelperProto -> d
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():69:69 -> <clinit>
-    1:8:void <init>(com.android.tools.r8.graph.AppView):90:97 -> <init>
+    1:1:void <clinit>():66:66 -> <clinit>
+    1:8:void <init>(com.android.tools.r8.graph.AppView):87:94 -> <init>
     1:3:void com.android.tools.r8.ir.desugar.records.RecordCfMethods.registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):46:48 -> a
-    1:3:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):85 -> a
-    4:4:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):86:86 -> a
+    1:3:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):82 -> a
+    4:4:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):83:83 -> a
     5:6:void com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordEqualsCfCodeProvider.registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):126:127 -> a
-    5:6:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):87 -> a
-    7:7:com.android.tools.r8.ir.desugar.records.RecordRewriter create(com.android.tools.r8.graph.AppView):81:81 -> a
-    8:10:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):102:104 -> a
+    5:6:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):84 -> a
+    7:7:com.android.tools.r8.ir.desugar.records.RecordRewriter create(com.android.tools.r8.graph.AppView):78:78 -> a
+    8:10:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):99:101 -> a
     11:11:boolean com.android.tools.r8.cf.code.CfInstruction.isInvokeDynamic():0:0 -> a
-    11:11:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):104 -> a
-    12:13:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):104:105 -> a
-    14:24:void com.android.tools.r8.ir.desugar.records.RecordRewriter.prepareInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):112:122 -> a
-    14:24:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):105 -> a
-    25:25:void com.android.tools.r8.ir.desugar.records.RecordRewriter.prepareInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):115:115 -> a
-    25:25:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):105 -> a
-    26:27:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):128:129 -> a
-    28:28:void com.android.tools.r8.ir.desugar.records.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):140:140 -> a
-    28:28:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):130 -> a
+    11:11:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):101 -> a
+    12:13:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):101:102 -> a
+    14:24:void com.android.tools.r8.ir.desugar.records.RecordRewriter.prepareInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):109:119 -> a
+    14:24:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):102 -> a
+    25:25:void com.android.tools.r8.ir.desugar.records.RecordRewriter.prepareInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):112:112 -> a
+    25:25:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):102 -> a
+    26:27:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):125:126 -> a
+    28:28:void com.android.tools.r8.ir.desugar.records.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):137:137 -> a
+    28:28:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):127 -> a
     29:29:boolean com.android.tools.r8.cf.code.CfInstruction.isInitClass():0:0 -> a
-    29:29:void com.android.tools.r8.ir.desugar.records.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):140 -> a
-    29:29:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):130 -> a
-    30:33:void com.android.tools.r8.ir.desugar.records.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):140:143 -> a
-    30:33:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):130 -> a
-    34:37:boolean com.android.tools.r8.ir.desugar.records.RecordRewriter.refersToRecord(com.android.tools.r8.graph.DexMethod):464:467 -> a
-    34:37:void com.android.tools.r8.ir.desugar.records.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):143 -> a
-    34:37:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):130 -> a
-    38:38:void com.android.tools.r8.ir.desugar.records.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):144:144 -> a
-    38:38:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):130 -> a
+    29:29:void com.android.tools.r8.ir.desugar.records.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):137 -> a
+    29:29:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):127 -> a
+    30:33:void com.android.tools.r8.ir.desugar.records.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):137:140 -> a
+    30:33:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):127 -> a
+    34:37:boolean com.android.tools.r8.ir.desugar.records.RecordRewriter.refersToRecord(com.android.tools.r8.graph.DexMethod):458:461 -> a
+    34:37:void com.android.tools.r8.ir.desugar.records.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):140 -> a
+    34:37:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):127 -> a
+    38:38:void com.android.tools.r8.ir.desugar.records.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):141:141 -> a
+    38:38:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):127 -> a
     39:39:boolean com.android.tools.r8.cf.code.CfInstruction.isFieldInstruction():0:0 -> a
-    39:39:void com.android.tools.r8.ir.desugar.records.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):148 -> a
-    39:39:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):130 -> a
-    40:41:void com.android.tools.r8.ir.desugar.records.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):149:150 -> a
-    40:41:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):130 -> a
-    42:43:boolean com.android.tools.r8.ir.desugar.records.RecordRewriter.refersToRecord(com.android.tools.r8.graph.DexField):459:460 -> a
-    42:43:void com.android.tools.r8.ir.desugar.records.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):150 -> a
-    42:43:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):130 -> a
-    44:51:void com.android.tools.r8.ir.desugar.records.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):151:158 -> a
-    44:51:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):130 -> a
-    52:52:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):174:174 -> a
+    39:39:void com.android.tools.r8.ir.desugar.records.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):145 -> a
+    39:39:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):127 -> a
+    40:41:void com.android.tools.r8.ir.desugar.records.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):146:147 -> a
+    40:41:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):127 -> a
+    42:43:boolean com.android.tools.r8.ir.desugar.records.RecordRewriter.refersToRecord(com.android.tools.r8.graph.DexField):453:454 -> a
+    42:43:void com.android.tools.r8.ir.desugar.records.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):147 -> a
+    42:43:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):127 -> a
+    44:51:void com.android.tools.r8.ir.desugar.records.RecordRewriter.scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):148:155 -> a
+    44:51:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):127 -> a
+    52:52:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):171:171 -> a
     53:53:boolean com.android.tools.r8.cf.code.CfInstruction.isInitClass():0:0 -> a
-    53:53:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):174 -> a
-    54:55:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):174:175 -> a
+    53:53:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):171 -> a
+    54:55:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):171:172 -> a
     56:56:boolean com.android.tools.r8.cf.code.CfInstruction.isInvokeDynamic():0:0 -> a
-    56:56:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):178 -> a
-    57:57:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):180:180 -> a
-    58:71:java.util.List com.android.tools.r8.ir.desugar.records.RecordRewriter.desugarInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):253:266 -> a
-    58:71:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):179 -> a
-    72:74:java.util.List com.android.tools.r8.ir.desugar.records.RecordRewriter.desugarInvokeRecordEquals(com.android.tools.r8.ir.desugar.records.RecordRewriter$RecordInvokeDynamic):380:382 -> a
-    72:74:java.util.List com.android.tools.r8.ir.desugar.records.RecordRewriter.desugarInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):267 -> a
-    72:74:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):179 -> a
-    75:75:java.util.List com.android.tools.r8.ir.desugar.records.RecordRewriter.desugarInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):269:269 -> a
-    75:75:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):179 -> a
-    76:82:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):186:192 -> a
-    83:83:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):191:191 -> a
-    84:96:com.android.tools.r8.ir.desugar.records.RecordRewriter$RecordInvokeDynamic parseInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):232:244 -> a
-    97:97:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.desugar.records.RecordRewriter.synthesizeEqualsRecordMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):274:274 -> a
-    97:97:com.android.tools.r8.graph.ProgramMethod lambda$ensureEqualsRecord$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):311 -> a
-    98:110:com.android.tools.r8.graph.ProgramMethod synthesizeMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider,com.android.tools.r8.graph.DexMethod):289:301 -> a
-    111:115:com.android.tools.r8.graph.DexMethod ensureEqualsRecord(com.android.tools.r8.ir.desugar.records.RecordRewriter$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.ProgramAdditions):306:310 -> a
-    116:116:com.android.tools.r8.graph.ProgramMethod lambda$ensureGetFieldsAsObjects$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.records.RecordRewriter$RecordInvokeDynamic,com.android.tools.r8.graph.DexMethod):322:322 -> a
-    117:117:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.desugar.records.RecordRewriter.synthesizeGetFieldsAsObjectsMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.DexMethod):280:280 -> a
-    117:117:com.android.tools.r8.graph.ProgramMethod lambda$ensureGetFieldsAsObjects$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.records.RecordRewriter$RecordInvokeDynamic,com.android.tools.r8.graph.DexMethod):322 -> a
-    118:121:com.android.tools.r8.graph.DexMethod equalsRecordMethod(com.android.tools.r8.graph.DexType):332:332 -> a
-    122:126:com.android.tools.r8.graph.ProgramMethod synthesizeRecordHelper(com.android.tools.r8.graph.DexProto,java.util.function.BiFunction,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):342:346 -> a
-    127:127:com.android.tools.r8.graph.ProgramMethod synthesizeRecordHelper(com.android.tools.r8.graph.DexProto,java.util.function.BiFunction,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):344:344 -> a
-    128:130:void lambda$synthesizeRecordHelper$3(com.android.tools.r8.graph.DexProto,java.util.function.BiFunction,com.android.tools.r8.synthesis.SyntheticMethodBuilder):350:352 -> a
-    131:131:com.android.tools.r8.graph.Code lambda$synthesizeRecordHelper$2(java.util.function.BiFunction,com.android.tools.r8.graph.DexMethod):352:352 -> a
-    132:147:java.util.List desugarInvokeRecordHashCode(com.android.tools.r8.ir.desugar.records.RecordRewriter$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):360:375 -> a
-    148:151:java.util.List desugarInvokeRecordToString(com.android.tools.r8.ir.desugar.records.RecordRewriter$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):391:394 -> a
-    152:152:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping.map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory):38:38 -> a
-    152:152:java.util.List desugarInvokeRecordToString(com.android.tools.r8.ir.desugar.records.RecordRewriter$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):392 -> a
-    153:167:java.util.List desugarInvokeRecordToString(com.android.tools.r8.ir.desugar.records.RecordRewriter$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):396:410 -> a
-    168:168:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):416:416 -> a
-    169:169:boolean com.android.tools.r8.cf.code.CfInstruction.isInvokeDynamic():0:0 -> a
-    169:169:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):416 -> a
-    170:174:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):417:421 -> a
-    175:175:boolean com.android.tools.r8.ir.desugar.records.RecordRewriter.needsDesugaring(com.android.tools.r8.graph.DexMethod,boolean):491:491 -> a
-    175:175:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):421 -> a
-    176:176:void ensureRecordClass(com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer):427:427 -> a
-    177:183:void com.android.tools.r8.ir.desugar.records.RecordRewriter.checkRecordTagNotPresent(com.android.tools.r8.graph.DexItemFactory):445:451 -> a
-    177:183:void ensureRecordClass(com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer):428 -> a
-    184:186:void ensureRecordClass(com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer):429:431 -> a
-    187:190:boolean refersToRecord(com.android.tools.r8.graph.DexProto):471:474 -> a
-    191:192:boolean com.android.tools.r8.ir.desugar.records.RecordRewriter.refersToRecord(com.android.tools.r8.graph.DexType[]):478:479 -> a
-    191:192:boolean refersToRecord(com.android.tools.r8.graph.DexProto):474 -> a
-    193:235:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):495:537 -> a
-    236:242:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):536:542 -> a
-    243:243:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isInstanceGet():140:140 -> a
-    243:243:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):542 -> a
-    244:262:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):542:560 -> a
-    263:263:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):559:559 -> a
-    264:280:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.DexMethod,boolean):568:584 -> a
-    281:281:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.DexMethod,boolean):575:575 -> a
-    282:282:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    282:282:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.DexMethod,boolean):575 -> a
-    283:283:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.DexMethod,boolean):575:575 -> a
-    284:296:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.records.RecordRewriter.synthesizeRecordInitMethod():589:601 -> a
-    284:296:void lambda$ensureRecordClass$4(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):436 -> a
-    297:297:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.records.RecordRewriter.synthesizeRecordInitMethod():600:600 -> a
-    297:297:void lambda$ensureRecordClass$4(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):436 -> a
-    298:299:void lambda$ensureRecordClass$4(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):438:439 -> a
-    300:301:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):607:608 -> a
-    302:305:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):618:621 -> a
-    1:4:com.android.tools.r8.graph.DexMethod ensureGetFieldsAsObjects(com.android.tools.r8.ir.desugar.records.RecordRewriter$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.ProgramAdditions):317:320 -> b
-    5:7:com.android.tools.r8.graph.DexMethod getFieldsAsObjectsMethod(com.android.tools.r8.graph.DexType):327:327 -> b
-    1:1:boolean refersToRecord(com.android.tools.r8.graph.DexType):487:487 -> c
-com.android.tools.r8.ir.desugar.records.RecordRewriter$1 -> com.android.tools.r8.internal.Ii1:
-com.android.tools.r8.ir.desugar.records.RecordRewriter$RecordInvokeDynamic -> com.android.tools.r8.internal.Ji1:
+    56:56:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):175 -> a
+    57:57:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):177:177 -> a
+    58:71:java.util.List com.android.tools.r8.ir.desugar.records.RecordRewriter.desugarInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):250:263 -> a
+    58:71:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):176 -> a
+    72:74:java.util.List com.android.tools.r8.ir.desugar.records.RecordRewriter.desugarInvokeRecordEquals(com.android.tools.r8.ir.desugar.records.RecordRewriter$RecordInvokeDynamic):374:376 -> a
+    72:74:java.util.List com.android.tools.r8.ir.desugar.records.RecordRewriter.desugarInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):264 -> a
+    72:74:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):176 -> a
+    75:75:java.util.List com.android.tools.r8.ir.desugar.records.RecordRewriter.desugarInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):266:266 -> a
+    75:75:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):176 -> a
+    76:82:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):183:189 -> a
+    83:83:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):188:188 -> a
+    84:96:com.android.tools.r8.ir.desugar.records.RecordRewriter$RecordInvokeDynamic parseInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):229:241 -> a
+    97:97:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.desugar.records.RecordRewriter.synthesizeEqualsRecordMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):271:271 -> a
+    97:97:com.android.tools.r8.graph.ProgramMethod lambda$ensureEqualsRecord$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):305 -> a
+    98:107:com.android.tools.r8.graph.ProgramMethod synthesizeMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider,com.android.tools.r8.graph.DexMethod):286:295 -> a
+    108:112:com.android.tools.r8.graph.DexMethod ensureEqualsRecord(com.android.tools.r8.ir.desugar.records.RecordRewriter$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.ProgramAdditions):300:304 -> a
+    113:113:com.android.tools.r8.graph.ProgramMethod lambda$ensureGetFieldsAsObjects$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.records.RecordRewriter$RecordInvokeDynamic,com.android.tools.r8.graph.DexMethod):316:316 -> a
+    114:114:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.desugar.records.RecordRewriter.synthesizeGetFieldsAsObjectsMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.DexMethod):277:277 -> a
+    114:114:com.android.tools.r8.graph.ProgramMethod lambda$ensureGetFieldsAsObjects$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.records.RecordRewriter$RecordInvokeDynamic,com.android.tools.r8.graph.DexMethod):316 -> a
+    115:118:com.android.tools.r8.graph.DexMethod equalsRecordMethod(com.android.tools.r8.graph.DexType):326:326 -> a
+    119:123:com.android.tools.r8.graph.ProgramMethod synthesizeRecordHelper(com.android.tools.r8.graph.DexProto,java.util.function.BiFunction,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):336:340 -> a
+    124:124:com.android.tools.r8.graph.ProgramMethod synthesizeRecordHelper(com.android.tools.r8.graph.DexProto,java.util.function.BiFunction,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):338:338 -> a
+    125:127:void lambda$synthesizeRecordHelper$3(com.android.tools.r8.graph.DexProto,java.util.function.BiFunction,com.android.tools.r8.synthesis.SyntheticMethodBuilder):344:346 -> a
+    128:128:com.android.tools.r8.graph.Code lambda$synthesizeRecordHelper$2(java.util.function.BiFunction,com.android.tools.r8.graph.DexMethod):346:346 -> a
+    129:144:java.util.List desugarInvokeRecordHashCode(com.android.tools.r8.ir.desugar.records.RecordRewriter$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):354:369 -> a
+    145:148:java.util.List desugarInvokeRecordToString(com.android.tools.r8.ir.desugar.records.RecordRewriter$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):385:388 -> a
+    149:149:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping.map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory):38:38 -> a
+    149:149:java.util.List desugarInvokeRecordToString(com.android.tools.r8.ir.desugar.records.RecordRewriter$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):386 -> a
+    150:164:java.util.List desugarInvokeRecordToString(com.android.tools.r8.ir.desugar.records.RecordRewriter$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):390:404 -> a
+    165:165:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):410:410 -> a
+    166:166:boolean com.android.tools.r8.cf.code.CfInstruction.isInvokeDynamic():0:0 -> a
+    166:166:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):410 -> a
+    167:171:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):411:415 -> a
+    172:172:boolean com.android.tools.r8.ir.desugar.records.RecordRewriter.needsDesugaring(com.android.tools.r8.graph.DexMethod,boolean):485:485 -> a
+    172:172:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):415 -> a
+    173:173:void ensureRecordClass(com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer):421:421 -> a
+    174:180:void com.android.tools.r8.ir.desugar.records.RecordRewriter.checkRecordTagNotPresent(com.android.tools.r8.graph.DexItemFactory):439:445 -> a
+    174:180:void ensureRecordClass(com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer):422 -> a
+    181:183:void ensureRecordClass(com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer):423:425 -> a
+    184:187:boolean refersToRecord(com.android.tools.r8.graph.DexProto):465:468 -> a
+    188:189:boolean com.android.tools.r8.ir.desugar.records.RecordRewriter.refersToRecord(com.android.tools.r8.graph.DexType[]):472:473 -> a
+    188:189:boolean refersToRecord(com.android.tools.r8.graph.DexProto):468 -> a
+    190:232:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):489:531 -> a
+    233:239:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):530:536 -> a
+    240:240:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isInstanceGet():140:140 -> a
+    240:240:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):536 -> a
+    241:259:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):536:554 -> a
+    260:260:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):553:553 -> a
+    261:277:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.DexMethod,boolean):562:578 -> a
+    278:278:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.DexMethod,boolean):569:569 -> a
+    279:279:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    279:279:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.DexMethod,boolean):569 -> a
+    280:280:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.DexMethod,boolean):569:569 -> a
+    281:290:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.records.RecordRewriter.synthesizeRecordInitMethod():583:592 -> a
+    281:290:void lambda$ensureRecordClass$4(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):430 -> a
+    291:291:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.records.RecordRewriter.synthesizeRecordInitMethod():591:591 -> a
+    291:291:void lambda$ensureRecordClass$4(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):430 -> a
+    292:293:void lambda$ensureRecordClass$4(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):432:433 -> a
+    294:295:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):598:599 -> a
+    296:299:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):609:612 -> a
+    1:4:com.android.tools.r8.graph.DexMethod ensureGetFieldsAsObjects(com.android.tools.r8.ir.desugar.records.RecordRewriter$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.ProgramAdditions):311:314 -> b
+    5:7:com.android.tools.r8.graph.DexMethod getFieldsAsObjectsMethod(com.android.tools.r8.graph.DexType):321:321 -> b
+    1:1:boolean refersToRecord(com.android.tools.r8.graph.DexType):481:481 -> c
+com.android.tools.r8.ir.desugar.records.RecordRewriter$1 -> com.android.tools.r8.internal.Gi1:
+com.android.tools.r8.ir.desugar.records.RecordRewriter$RecordInvokeDynamic -> com.android.tools.r8.internal.Hi1:
     com.android.tools.r8.graph.DexString methodName -> a
     com.android.tools.r8.graph.DexString fieldNames -> b
     com.android.tools.r8.graph.DexField[] fields -> c
     com.android.tools.r8.graph.DexProgramClass recordClass -> d
-    1:1:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.records.RecordRewriter$1):195:195 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.DexProgramClass):206:210 -> <init>
-    1:1:com.android.tools.r8.graph.DexString getFieldNames():222:222 -> a
-    1:1:com.android.tools.r8.graph.DexField[] getFields():214:214 -> b
-    1:1:com.android.tools.r8.graph.DexString getMethodName():226:226 -> c
-    1:1:com.android.tools.r8.graph.DexProgramClass getRecordClass():218:218 -> d
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring -> com.android.tools.r8.internal.To1:
+    1:1:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.records.RecordRewriter$1):192:192 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.DexProgramClass):203:207 -> <init>
+    1:1:com.android.tools.r8.graph.DexString getFieldNames():219:219 -> a
+    1:1:com.android.tools.r8.graph.DexField[] getFields():211:211 -> b
+    1:1:com.android.tools.r8.graph.DexString getMethodName():223:223 -> c
+    1:1:com.android.tools.r8.graph.DexProgramClass getRecordClass():215:215 -> d
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring -> com.android.tools.r8.internal.Lo1:
     com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> b
     java.util.Map paramTypeToAppendMethod -> c
     com.android.tools.r8.graph.DexItemFactory factory -> a
@@ -84567,12 +84653,12 @@ com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring -
     175:175:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
     175:175:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.ProgramMethod,java.lang.String):420 -> a
     1:1:com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods access$100(com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring):48:48 -> b
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk -> com.android.tools.r8.internal.Po1:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk -> com.android.tools.r8.internal.Ho1:
     int variableIndex -> c
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,int):374:375 -> <init>
     com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk asArgumentChunk() -> a
     1:1:int getVariableIndex():379:379 -> d
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$Chunk -> com.android.tools.r8.internal.Qo1:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$Chunk -> com.android.tools.r8.internal.Io1:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexMethod method -> a
     1:1:void <clinit>():335:335 -> <clinit>
@@ -84584,7 +84670,7 @@ com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$C
     2:2:int com.android.tools.r8.graph.DexProto.getArity():91:91 -> c
     2:2:com.android.tools.r8.ir.code.ValueType getValueType():348 -> c
     3:4:com.android.tools.r8.ir.code.ValueType getValueType():348:349 -> c
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConcatBuilder -> com.android.tools.r8.internal.Ro1:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConcatBuilder -> com.android.tools.r8.internal.Jo1:
     java.util.List chunks -> a
     com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring this$0 -> e
     com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk biggestArgumentChunk -> b
@@ -84610,12 +84696,12 @@ com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$C
     37:37:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):310 -> a
     38:54:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):310:326 -> a
     55:59:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):324:328 -> a
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk -> com.android.tools.r8.internal.So1:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk -> com.android.tools.r8.internal.Ko1:
     com.android.tools.r8.graph.DexString stringConstant -> c
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):398:399 -> <init>
     com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk asConstantChunk() -> b
     1:1:com.android.tools.r8.graph.DexString getStringConstant():403:403 -> d
-com.android.tools.r8.ir.desugar.twr.TwrInstructionDesugaring -> com.android.tools.r8.internal.pr1:
+com.android.tools.r8.ir.desugar.twr.TwrInstructionDesugaring -> com.android.tools.r8.internal.hr1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexProto twrCloseResourceProto -> c
@@ -84767,9 +84853,9 @@ com.android.tools.r8.ir.desugar.twr.TwrInstructionDesugaring -> com.android.tool
     858:859:boolean isTwrCloseResourceInvoke(com.android.tools.r8.cf.code.CfInstruction):158:159 -> a
     860:860:boolean com.android.tools.r8.ir.desugar.twr.TwrInstructionDesugaring.isTwrCloseResourceMethod(com.android.tools.r8.graph.DexMethod):163:163 -> a
     860:860:boolean isTwrCloseResourceInvoke(com.android.tools.r8.cf.code.CfInstruction):159 -> a
-com.android.tools.r8.ir.optimize.ArgumentRemovalUtils -> com.android.tools.r8.internal.Iz0:
+com.android.tools.r8.ir.optimize.ArgumentRemovalUtils -> com.android.tools.r8.internal.Lz0:
     1:5:boolean isPinned(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):16:20 -> a
-com.android.tools.r8.ir.optimize.AssertionsRewriter -> com.android.tools.r8.internal.hA0:
+com.android.tools.r8.ir.optimize.AssertionsRewriter -> com.android.tools.r8.internal.kA0:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.AssertionsConfiguration$AssertionTransformation defaultTransformation -> c
@@ -84874,10 +84960,10 @@ com.android.tools.r8.ir.optimize.AssertionsRewriter -> com.android.tools.r8.inte
     172:172:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):364 -> a
     172:172:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     173:173:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):308:308 -> a
-com.android.tools.r8.ir.optimize.AssertionsRewriter$1 -> com.android.tools.r8.internal.fA0:
+com.android.tools.r8.ir.optimize.AssertionsRewriter$1 -> com.android.tools.r8.internal.iA0:
     int[] $SwitchMap$com$android$tools$r8$AssertionsConfiguration$AssertionTransformationScope -> a
     1:1:void <clinit>():41:41 -> <clinit>
-com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString -> com.android.tools.r8.internal.gA0:
+com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString -> com.android.tools.r8.internal.jA0:
     com.android.tools.r8.graph.DexString value -> b
     com.android.tools.r8.AssertionsConfiguration entry -> a
     1:1:void <init>(com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.AssertionsRewriter$1):33:33 -> <init>
@@ -84888,7 +84974,7 @@ com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexStr
     52:52:void <init>(com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory):47:47 -> <init>
     1:1:com.android.tools.r8.AssertionsConfiguration access$000(com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString):33:33 -> a
     1:1:com.android.tools.r8.graph.DexString access$100(com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString):33:33 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter -> com.android.tools.r8.internal.zA0:
+com.android.tools.r8.ir.optimize.AssumeInserter -> com.android.tools.r8.internal.CA0:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():60:60 -> <clinit>
@@ -85051,11 +85137,11 @@ com.android.tools.r8.ir.optimize.AssumeInserter -> com.android.tools.r8.internal
     110:110:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> b
     110:110:boolean lambda$materializeAssumeInstructions$8(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):529 -> b
     1:1:java.util.List lambda$materializeSelectedAssumeInstructions$13(com.android.tools.r8.ir.code.Instruction):617:617 -> c
-com.android.tools.r8.ir.optimize.AssumeInserter$1 -> com.android.tools.r8.internal.oA0:
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance -> com.android.tools.r8.internal.qA0:
+com.android.tools.r8.ir.optimize.AssumeInserter$1 -> com.android.tools.r8.internal.rA0:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance -> com.android.tools.r8.internal.tA0:
     1:1:void <init>():910:910 -> <init>
     com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance asSomething() -> a
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance$Builder -> com.android.tools.r8.internal.pA0:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance$Builder -> com.android.tools.r8.internal.sA0:
     java.util.Map dominatedPhiUsers -> c
     com.android.tools.r8.ir.code.Value assumedValue -> a
     java.util.Set dominatedUsers -> b
@@ -85073,7 +85159,7 @@ com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance$Builder -> com.
     13:13:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():994:994 -> a
     14:14:com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.something(java.util.Set,java.util.Map):958:958 -> a
     14:14:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():994 -> a
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo -> com.android.tools.r8.internal.rA0:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo -> com.android.tools.r8.internal.uA0:
     com.android.tools.r8.ir.code.Assume$NonNullAssumption nonNullAssumption -> c
     com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance dominance -> a
     com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption dynamicTypeAssumption -> b
@@ -85081,7 +85167,7 @@ com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo -> com.android.
     1:1:boolean hasDynamicTypeInfo():699:699 -> a
     1:1:boolean isNonNull():728:728 -> b
     1:1:void setNotNull():732:732 -> c
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues -> com.android.tools.r8.internal.tA0:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues -> com.android.tools.r8.internal.wA0:
     java.util.Map assumedValues -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():749:749 -> <clinit>
@@ -85106,7 +85192,7 @@ com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues -> com.android.too
     33:33:void removeAll(java.util.Map):818:818 -> a
     34:38:void lambda$removeAll$3(com.android.tools.r8.ir.code.Instruction,java.util.Map):820:824 -> a
     39:56:void removeIf(com.android.tools.r8.utils.TriPredicate):831:848 -> a
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder -> com.android.tools.r8.internal.sA0:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder -> com.android.tools.r8.internal.vA0:
     java.util.Map assumedValues -> a
     java.util.Set nonNullValuesKnownToDominateAllUsers -> b
     1:7:void <init>():853:859 -> <init>
@@ -85141,34 +85227,34 @@ com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder -> com.and
     1:1:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):897 -> b
     2:2:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):897:897 -> b
     3:3:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):896:896 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance -> com.android.tools.r8.internal.uA0:
+com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance -> com.android.tools.r8.internal.xA0:
     com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance INSTANCE -> a
     1:1:void <clinit>():1001:1001 -> <clinit>
     1:1:void <init>():1003:1003 -> <init>
     1:1:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance getInstance():1006:1006 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance -> com.android.tools.r8.internal.vA0:
+com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance -> com.android.tools.r8.internal.yA0:
     com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance INSTANCE -> a
     1:1:void <clinit>():1017:1017 -> <clinit>
     1:1:void <init>():1020:1020 -> <init>
     1:1:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance getInstance():1023:1023 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance -> com.android.tools.r8.internal.wA0:
+com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance -> com.android.tools.r8.internal.zA0:
     com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance INSTANCE -> a
     1:1:void <clinit>():1034:1034 -> <clinit>
     1:1:void <init>():1036:1036 -> <init>
     1:1:com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance getInstance():1039:1039 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance -> com.android.tools.r8.internal.xA0:
+com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance -> com.android.tools.r8.internal.AA0:
     java.util.Map dominatedPhiUsers -> b
     java.util.Set dominatedUsers -> a
     1:3:void <init>(java.util.Set,java.util.Map):1054:1056 -> <init>
     com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance asSomething() -> a
     1:1:java.util.Map getDominatedPhiUsers():1064:1064 -> b
     1:1:java.util.Set getDominatedUsers():1060:1060 -> c
-com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance -> com.android.tools.r8.internal.yA0:
+com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance -> com.android.tools.r8.internal.BA0:
     com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance INSTANCE -> a
     1:1:void <clinit>():1080:1080 -> <clinit>
     1:1:void <init>():1082:1082 -> <init>
     1:1:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance getInstance():1085:1085 -> b
-com.android.tools.r8.ir.optimize.AssumeRemover -> com.android.tools.r8.internal.AA0:
+com.android.tools.r8.ir.optimize.AssumeRemover -> com.android.tools.r8.internal.DA0:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set affectedValues -> c
     java.util.Set assumeInstructionsToRemove -> d
@@ -85194,7 +85280,7 @@ com.android.tools.r8.ir.optimize.AssumeRemover -> com.android.tools.r8.internal.
     41:41:void finish():122:122 -> a
     1:1:java.util.Set getAffectedValues():47:47 -> b
     1:1:boolean mayHaveIntroducedTrivialPhi():51:51 -> c
-com.android.tools.r8.ir.optimize.BasicBlockInstructionsEquivalence -> com.android.tools.r8.internal.hB0:
+com.android.tools.r8.ir.optimize.BasicBlockInstructionsEquivalence -> com.android.tools.r8.internal.kB0:
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> a
     int[] hashes -> b
     boolean $assertionsDisabled -> c
@@ -85213,103 +85299,104 @@ com.android.tools.r8.ir.optimize.BasicBlockInstructionsEquivalence -> com.androi
     39:39:boolean doEquivalent(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):70 -> a
     40:40:void clearComputedHash(com.android.tools.r8.ir.code.BasicBlock):74:74 -> a
     1:12:int computeHash(com.android.tools.r8.ir.code.BasicBlock):90:101 -> b
-com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator -> com.android.tools.r8.internal.OC0:
+com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator -> com.android.tools.r8.internal.RC0:
+    com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode mode -> d
     com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.utils.collections.ProgramMethodSet revisitedMethods -> d
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> f
     com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions optimizationOptions -> c
-    com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode mode -> e
-    1:1:void <clinit>():41:41 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):67:67 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.AppView):64:73 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode getMode():78:78 -> a
-    2:10:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):98:106 -> a
-    11:25:void com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.collectCallSiteOptimizationInfoForInvokeMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):115:129 -> a
-    11:25:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):105 -> a
-    26:26:boolean com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.isMaybeClasspathOrLibraryMethodOverride(com.android.tools.r8.graph.ProgramMethod):153:153 -> a
-    26:26:void com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.collectCallSiteOptimizationInfoForInvokeMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):130 -> a
-    26:26:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):105 -> a
-    27:27:void com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.collectCallSiteOptimizationInfoForInvokeMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):133:133 -> a
-    27:27:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):105 -> a
+    com.android.tools.r8.utils.collections.ProgramMethodSet revisitedMethodsForTesting -> e
+    1:1:void <clinit>():43:43 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):70:70 -> <init>
+    2:12:void <init>(com.android.tools.r8.graph.AppView):66:76 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode getMode():81:81 -> a
+    2:10:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):101:109 -> a
+    11:25:void com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.collectCallSiteOptimizationInfoForInvokeMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):118:132 -> a
+    11:25:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):108 -> a
+    26:26:boolean com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.isMaybeClasspathOrLibraryMethodOverride(com.android.tools.r8.graph.ProgramMethod):156:156 -> a
+    26:26:void com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.collectCallSiteOptimizationInfoForInvokeMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):133 -> a
+    26:26:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):108 -> a
+    27:27:void com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.collectCallSiteOptimizationInfoForInvokeMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):136:136 -> a
+    27:27:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):108 -> a
     28:28:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> a
-    28:28:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):107 -> a
-    29:29:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):108:108 -> a
-    30:37:void com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.collectCallSiteOptimizationInfoForInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom):139:146 -> a
-    30:37:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):108 -> a
-    38:51:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):162:175 -> a
+    28:28:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):110 -> a
+    29:29:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):111:111 -> a
+    30:37:void com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.collectCallSiteOptimizationInfoForInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom):142:149 -> a
+    30:37:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):111 -> a
+    38:51:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):165:178 -> a
     52:52:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.isAbandoned():0:0 -> a
-    52:52:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):175 -> a
-    53:53:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):177:177 -> a
-    54:57:boolean com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.verifyAllProgramDispatchTargetsHaveBeenAbandoned(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):413:416 -> a
-    54:57:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):177 -> a
+    52:52:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):178 -> a
+    53:53:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):180:180 -> a
+    54:57:boolean com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.verifyAllProgramDispatchTargetsHaveBeenAbandoned(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):425:428 -> a
+    54:57:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):180 -> a
     58:58:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.isAbandoned():0:0 -> a
-    58:58:boolean com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.verifyAllProgramDispatchTargetsHaveBeenAbandoned(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):416 -> a
-    58:58:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):177 -> a
-    59:65:boolean com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.verifyAllProgramDispatchTargetsHaveBeenAbandoned(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):416:422 -> a
-    59:65:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):177 -> a
-    66:73:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):181:188 -> a
-    74:94:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):185:205 -> a
-    95:96:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.propagateArgumentsToDispatchTarget(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.utils.Timing):224:225 -> a
-    95:96:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):207 -> a
+    58:58:boolean com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.verifyAllProgramDispatchTargetsHaveBeenAbandoned(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):428 -> a
+    58:58:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):180 -> a
+    59:65:boolean com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.verifyAllProgramDispatchTargetsHaveBeenAbandoned(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):428:434 -> a
+    59:65:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):180 -> a
+    66:73:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):184:191 -> a
+    74:94:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):188:208 -> a
+    95:96:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.propagateArgumentsToDispatchTarget(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.utils.Timing):227:228 -> a
+    95:96:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):210 -> a
     97:97:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.isAbandoned():0:0 -> a
-    97:97:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.propagateArgumentsToDispatchTarget(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.utils.Timing):225 -> a
-    97:97:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):207 -> a
-    98:110:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.propagateArgumentsToDispatchTarget(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.utils.Timing):226:238 -> a
-    98:110:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):207 -> a
+    97:97:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.propagateArgumentsToDispatchTarget(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.utils.Timing):228 -> a
+    97:97:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):210 -> a
+    98:110:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.propagateArgumentsToDispatchTarget(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.utils.Timing):229:241 -> a
+    98:110:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):210 -> a
     111:111:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.hasUsefulOptimizationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):77:77 -> a
-    111:111:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.propagateArgumentsToDispatchTarget(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.utils.Timing):238 -> a
-    111:111:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):207 -> a
-    112:112:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.propagateArgumentsToDispatchTarget(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.utils.Timing):240:240 -> a
-    112:112:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):207 -> a
-    113:119:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.propagateArgumentsToDispatchTarget(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.utils.Timing):237:243 -> a
-    113:119:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):207 -> a
-    120:120:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):211:211 -> a
+    111:111:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.propagateArgumentsToDispatchTarget(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.utils.Timing):241 -> a
+    111:111:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):210 -> a
+    112:112:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.propagateArgumentsToDispatchTarget(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.utils.Timing):243:243 -> a
+    112:112:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):210 -> a
+    113:119:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.propagateArgumentsToDispatchTarget(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.utils.Timing):240:246 -> a
+    113:119:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):210 -> a
+    120:120:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):214:214 -> a
     121:121:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.isAbandoned():0:0 -> a
-    121:121:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):211 -> a
-    122:126:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):212:216 -> a
-    127:157:void abandonCallSitePropagation(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):251:281 -> a
-    158:169:void lambda$abandonCallSitePropagation$2(com.android.tools.r8.graph.LookupResult,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Consumer):267:267 -> a
-    170:170:void lambda$abandonCallSitePropagation$1(java.util.function.Consumer,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):269:269 -> a
+    121:121:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):214 -> a
+    122:126:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):215:219 -> a
+    127:157:void abandonCallSitePropagation(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):254:284 -> a
+    158:169:void lambda$abandonCallSitePropagation$2(com.android.tools.r8.graph.LookupResult,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Consumer):270:270 -> a
+    170:170:void lambda$abandonCallSitePropagation$1(java.util.function.Consumer,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):272:272 -> a
     171:171:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    171:171:void lambda$abandonCallSitePropagation$1(java.util.function.Consumer,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):269 -> a
-    172:176:void lambda$abandonCallSitePropagation$1(java.util.function.Consumer,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):270:274 -> a
+    171:171:void lambda$abandonCallSitePropagation$1(java.util.function.Consumer,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):272 -> a
+    172:176:void lambda$abandonCallSitePropagation$1(java.util.function.Consumer,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):273:277 -> a
     177:177:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
-    177:177:void lambda$abandonCallSitePropagation$1(java.util.function.Consumer,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):274 -> a
-    178:178:void lambda$abandonCallSitePropagation$1(java.util.function.Consumer,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):274:274 -> a
-    179:184:void abandonCallSitePropagation(com.android.tools.r8.utils.ForEachable):285:290 -> a
-    185:185:void abandonCallSitePropagationForLambdaImplementationMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):296:296 -> a
-    186:186:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    186:186:void abandonCallSitePropagationForLambdaImplementationMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):296 -> a
-    187:204:void abandonCallSitePropagationForLambdaImplementationMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):297:314 -> a
-    205:208:void lambda$abandonCallSitePropagationForLambdaImplementationMethods$5(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):304:307 -> a
-    209:214:void forEachPinnedNonPrivateVirtualMethod(java.util.function.Consumer):329:334 -> a
+    177:177:void lambda$abandonCallSitePropagation$1(java.util.function.Consumer,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):277 -> a
+    178:178:void lambda$abandonCallSitePropagation$1(java.util.function.Consumer,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):277:277 -> a
+    179:184:void abandonCallSitePropagation(com.android.tools.r8.utils.ForEachable):288:293 -> a
+    185:185:void abandonCallSitePropagationForLambdaImplementationMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):299:299 -> a
+    186:186:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    186:186:void abandonCallSitePropagationForLambdaImplementationMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):299 -> a
+    187:204:void abandonCallSitePropagationForLambdaImplementationMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):300:317 -> a
+    205:208:void lambda$abandonCallSitePropagationForLambdaImplementationMethods$5(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):307:310 -> a
+    209:214:void forEachPinnedNonPrivateVirtualMethod(java.util.function.Consumer):332:337 -> a
     215:215:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):171:171 -> a
-    215:215:void forEachPinnedNonPrivateVirtualMethod(java.util.function.Consumer):334 -> a
-    216:216:void forEachPinnedNonPrivateVirtualMethod(java.util.function.Consumer):335:335 -> a
-    217:238:void abandonCallSitePropagationForMethodAndOverrides(com.android.tools.r8.graph.ProgramMethod):342:363 -> a
-    239:239:void lambda$abandonCallSitePropagationForMethodAndOverrides$7(java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):351:351 -> a
+    215:215:void forEachPinnedNonPrivateVirtualMethod(java.util.function.Consumer):337 -> a
+    216:216:void forEachPinnedNonPrivateVirtualMethod(java.util.function.Consumer):338:338 -> a
+    217:238:void abandonCallSitePropagationForMethodAndOverrides(com.android.tools.r8.graph.ProgramMethod):345:366 -> a
+    239:239:void lambda$abandonCallSitePropagationForMethodAndOverrides$7(java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):354:354 -> a
     240:240:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    240:240:void lambda$abandonCallSitePropagationForMethodAndOverrides$7(java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):351 -> a
-    241:241:void lambda$abandonCallSitePropagationForMethodAndOverrides$7(java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):352:352 -> a
-    242:242:void lambda$abandonCallSitePropagationForMethodAndOverrides$8(java.util.Set,com.android.tools.r8.graph.LookupLambdaTarget):356:356 -> a
+    240:240:void lambda$abandonCallSitePropagationForMethodAndOverrides$7(java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):354 -> a
+    241:241:void lambda$abandonCallSitePropagationForMethodAndOverrides$7(java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):355:355 -> a
+    242:242:void lambda$abandonCallSitePropagationForMethodAndOverrides$8(java.util.Set,com.android.tools.r8.graph.LookupLambdaTarget):359:359 -> a
     243:243:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    243:243:void lambda$abandonCallSitePropagationForMethodAndOverrides$8(java.util.Set,com.android.tools.r8.graph.LookupLambdaTarget):356 -> a
-    244:244:void lambda$abandonCallSitePropagationForMethodAndOverrides$8(java.util.Set,com.android.tools.r8.graph.LookupLambdaTarget):357:357 -> a
-    245:248:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.computeCallSiteOptimizationInfoFromArguments(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):368:371 -> a
-    245:248:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo lambda$propagateArgumentsToDispatchTargets$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):204 -> a
-    249:257:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.computeCallSiteOptimizationInfoFromArguments(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):370:378 -> a
-    249:257:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo lambda$propagateArgumentsToDispatchTargets$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):204 -> a
-    258:267:boolean lambda$methodsToRevisit$9(com.android.tools.r8.graph.DexEncodedMethod):389:398 -> a
-    268:269:void lambda$methodsToRevisit$10(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):401:402 -> a
-    1:9:void logResults():82:90 -> b
-    10:10:void logResults():86:86 -> b
-    11:11:void lambda$abandonCallSitePropagation$3(com.android.tools.r8.graph.ProgramMethod):287:287 -> b
-    12:13:void lambda$abandonCallSitePropagationForLambdaImplementationMethods$6(java.util.function.Consumer):301:302 -> b
-    14:19:void abandonCallSitePropagationForPinnedMethodsAndOverrides(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):320:325 -> b
-    1:1:void lambda$abandonCallSitePropagation$4(com.android.tools.r8.graph.ProgramMethod):290:290 -> c
-    2:24:com.android.tools.r8.utils.collections.ProgramMethodSet methodsToRevisit():384:406 -> c
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.internal.uG0:
+    243:243:void lambda$abandonCallSitePropagationForMethodAndOverrides$8(java.util.Set,com.android.tools.r8.graph.LookupLambdaTarget):359 -> a
+    244:244:void lambda$abandonCallSitePropagationForMethodAndOverrides$8(java.util.Set,com.android.tools.r8.graph.LookupLambdaTarget):360:360 -> a
+    245:248:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.computeCallSiteOptimizationInfoFromArguments(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):371:374 -> a
+    245:248:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo lambda$propagateArgumentsToDispatchTargets$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):207 -> a
+    249:257:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.computeCallSiteOptimizationInfoFromArguments(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):373:381 -> a
+    249:257:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo lambda$propagateArgumentsToDispatchTargets$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):207 -> a
+    258:260:void enqueueMethodsForReprocessing(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder):388:390 -> a
+    261:270:boolean lambda$methodsToRevisit$9(com.android.tools.r8.graph.DexEncodedMethod):401:410 -> a
+    271:272:void lambda$methodsToRevisit$10(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):413:414 -> a
+    1:9:void logResults():85:93 -> b
+    10:10:void logResults():89:89 -> b
+    11:11:void lambda$abandonCallSitePropagation$3(com.android.tools.r8.graph.ProgramMethod):290:290 -> b
+    12:13:void lambda$abandonCallSitePropagationForLambdaImplementationMethods$6(java.util.function.Consumer):304:305 -> b
+    14:19:void abandonCallSitePropagationForPinnedMethodsAndOverrides(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):323:328 -> b
+    1:1:void lambda$abandonCallSitePropagation$4(com.android.tools.r8.graph.ProgramMethod):293:293 -> c
+    2:26:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder methodsToRevisit():394:418 -> c
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.internal.xG0:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction waveDoneAction -> d
@@ -85385,7 +85472,7 @@ com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.and
     742:742:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
     742:742:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):544 -> a
     743:744:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):544:545 -> a
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult -> com.android.tools.r8.internal.sG0:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult -> com.android.tools.r8.internal.vG0:
     java.util.Map fieldsWithStaticValues -> a
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult EMPTY -> b
     boolean $assertionsDisabled -> c
@@ -85394,19 +85481,19 @@ com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassIniti
     1:1:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult empty():76:76 -> a
     2:3:void forEachOptimizedField(java.util.function.BiConsumer):80:81 -> a
     4:4:com.android.tools.r8.graph.DexValue getStaticValue(com.android.tools.r8.graph.DexEncodedField):94:94 -> a
-    5:5:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> a
+    5:5:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> a
     5:5:com.android.tools.r8.graph.DexValue getStaticValue(com.android.tools.r8.graph.DexEncodedField):95 -> a
     6:10:com.android.tools.r8.graph.DexValue getStaticValue(com.android.tools.r8.graph.DexEncodedField):95:99 -> a
-    1:1:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> b
+    1:1:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> b
     1:1:boolean hasStaticValue(com.android.tools.r8.graph.DexEncodedField):86 -> b
     2:3:boolean hasStaticValue(com.android.tools.r8.graph.DexEncodedField):87:88 -> b
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.internal.tG0:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.internal.wG0:
     java.util.Map fieldsWithStaticValues -> b
     1:1:void <init>(java.util.Map):107:107 -> <init>
     2:5:void <init>(java.util.Map):105:108 -> <init>
     1:1:void join(java.util.Map):112:112 -> a
     2:2:void execute():118:118 -> a
-com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.internal.gI0:
+com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.internal.jI0:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -85658,7 +85745,7 @@ com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.internal.g
     1249:1249:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1172:1172 -> a
     1249:1249:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3732 -> a
     1250:1250:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3732:3732 -> a
-    1251:1254: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):1459:1462 -> a
+    1251:1254: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):1463:1466 -> a
     1251:1254:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3732 -> a
     1255:1255:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3733:3733 -> a
     1256:1256:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1172:1172 -> a
@@ -85798,7 +85885,7 @@ com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.internal.g
     28:28:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3467 -> i
     29:32:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3472:3475 -> i
     1:1:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1338:1338 -> j
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> j
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> j
     2:2:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1338 -> j
     3:34:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1338:1369 -> j
     35:35:boolean com.android.tools.r8.ir.optimize.CodeRewriter.checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1318:1318 -> j
@@ -85882,7 +85969,7 @@ com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.internal.g
     75:76:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1986 -> n
     77:86:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2000:2009 -> n
     1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2237:2237 -> o
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> o
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> o
     2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2237 -> o
     3:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2240:2248 -> o
     12:28:boolean com.android.tools.r8.ir.optimize.CodeRewriter.allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2213:2229 -> o
@@ -85928,7 +86015,7 @@ com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.internal.g
     55:55:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2602 -> r
     56:90:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3243:3277 -> r
     56:90:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2602 -> r
-    91:91:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1594:1594 -> r
+    91:91:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> r
     91:91:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3278 -> r
     91:91:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2602 -> r
     92:113:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3280:3301 -> r
@@ -85977,7 +86064,7 @@ com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.internal.g
     68:68:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1807 -> t
     69:79:boolean com.android.tools.r8.ir.optimize.CodeRewriter.canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1889:1899 -> t
     69:79:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1807 -> t
-    80:92:boolean com.android.tools.r8.ir.code.BasicBlock.hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1961:1973 -> t
+    80:92:boolean com.android.tools.r8.ir.code.BasicBlock.hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1965:1977 -> t
     80:92:boolean com.android.tools.r8.ir.optimize.CodeRewriter.canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1899 -> t
     80:92:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1807 -> t
     93:93:boolean com.android.tools.r8.ir.optimize.CodeRewriter.canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1902:1902 -> t
@@ -85992,10 +86079,10 @@ com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.internal.g
     8:8:boolean com.android.tools.r8.ir.code.Instruction.isNeg():0:0 -> u
     8:8:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3868 -> u
     9:41:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3869:3901 -> u
-com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.internal.ZH0:
+com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.internal.cI0:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():2683:2683 -> <clinit>
-com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.internal.aI0:
+com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.internal.dI0:
     com.android.tools.r8.utils.InternalOptions options -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():2404:2404 -> <clinit>
@@ -86017,7 +86104,7 @@ com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.an
     22:36:int doHash(java.lang.Object):2404 -> a
     37:42:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2468:2473 -> a
     43:47:int getHashCode(com.android.tools.r8.ir.code.Value):2479:2483 -> a
-com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult -> com.android.tools.r8.internal.bI0:
+com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult -> com.android.tools.r8.internal.eI0:
     boolean anyAffectedValues -> a
     boolean anySimplifications -> b
     boolean $assertionsDisabled -> c
@@ -86026,7 +86113,7 @@ com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult ->
     2:5:void <init>(boolean,boolean):2566:2569 -> <init>
     1:1:boolean anyAffectedValues():2573:2573 -> a
     1:1:boolean anySimplifications():2577:2577 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.internal.cI0:
+com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.internal.fI0:
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> g
     com.android.tools.r8.ir.code.BasicBlock target -> f
     com.android.tools.r8.ir.code.Value left -> d
@@ -86042,15 +86129,15 @@ com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.
     10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1146:1146 -> a
     10:10:com.android.tools.r8.ir.code.BasicBlock build():670 -> a
     11:16:com.android.tools.r8.ir.code.BasicBlock build():671:676 -> 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):1459:1462 -> 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):1463:1466 -> a
     17:20:com.android.tools.r8.ir.code.BasicBlock build():676 -> a
     21:23:com.android.tools.r8.ir.code.BasicBlock build():678:680 -> a
     1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):655:655 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.internal.dI0:
+com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.internal.gI0:
     com.android.tools.r8.ir.code.Position position -> b
     int blockNumber -> a
     1:2:void <init>(com.android.tools.r8.ir.code.Position):555:556 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.internal.eI0:
+com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.internal.hI0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList keys -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():761:761 -> <clinit>
@@ -86081,7 +86168,7 @@ com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.i
     11:12:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):782:783 -> b
     13:13:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> b
     13:13:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):783 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.internal.fI0:
+com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.internal.iI0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap keyToTarget -> d
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> e
     com.android.tools.r8.ir.code.Value value -> c
@@ -86091,12 +86178,12 @@ com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools
     2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):587:587 -> a
     3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):592:592 -> a
     4:25:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):598:619 -> 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):1489:1492 -> 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):1493:1496 -> a
     26:29:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):619 -> a
     30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):620:621 -> 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):610:610 -> 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):616:616 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.internal.zJ0:
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.internal.CJ0:
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> a
     int numberOfEffectivelyFinalFieldCanonicalization -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> g
@@ -86155,7 +86242,7 @@ com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.i
     206:206:boolean lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):199:199 -> a
     207:207:int lambda$canonicalize$4(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):209:209 -> a
     1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):208:208 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.internal.yJ0:
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.internal.BJ0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():95:95 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.ConstantCanonicalizer):95:95 -> <init>
@@ -86171,7 +86258,7 @@ com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8
     29:29:int hashCode(java.lang.Object):95 -> a
     30:30:int com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1.hashCode(com.android.tools.r8.ir.code.Instruction):102:102 -> a
     30:30:int hashCode(java.lang.Object):95 -> a
-com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.internal.cK0:
+com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.internal.fK0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> b
     boolean $assertionsDisabled -> c
@@ -86201,7 +86288,7 @@ com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.interna
     15:15:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):75 -> b
     16:16:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):76:76 -> b
     17:17:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):75:75 -> b
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult -> com.android.tools.r8.internal.bK0:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult -> com.android.tools.r8.internal.eK0:
     com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult DEFINITELY_DEAD_INSTANCE -> a
     com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult DEFINITELY_NOT_DEAD_INSTANCE -> b
     1:9:void <clinit>():239:247 -> <clinit>
@@ -86212,16 +86299,16 @@ com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult -> com.an
     boolean isMaybeDead() -> c
     boolean isNotDead() -> d
     1:1:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult notDead():260:260 -> e
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$1 -> com.android.tools.r8.internal.YJ0:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$1 -> com.android.tools.r8.internal.bK0:
     1:1:void <init>():240:240 -> <init>
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$2 -> com.android.tools.r8.internal.ZJ0:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$2 -> com.android.tools.r8.internal.cK0:
     1:1:void <init>():248:248 -> <init>
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$3 -> com.android.tools.r8.internal.aK0:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$3 -> com.android.tools.r8.internal.dK0:
     com.android.tools.r8.ir.code.Value val$inValueRequiredToBeDead -> c
     1:1:void <init>(com.android.tools.r8.ir.code.Value):264:264 -> <init>
     1:1:java.lang.Iterable getValuesRequiredToBeDead():277:277 -> b
     2:2:java.util.Iterator lambda$getValuesRequiredToBeDead$0(com.android.tools.r8.ir.code.Value):277:277 -> b
-com.android.tools.r8.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.internal.rK0:
+com.android.tools.r8.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.internal.uK0:
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> d
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.Inliner inliner -> b
@@ -86240,7 +86327,7 @@ com.android.tools.r8.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.i
     48:50:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):95:97 -> a
     48:50:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):274 -> a
     51:69:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):125:143 -> a
-    70:70:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    70:70:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     70:70:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):143 -> a
     71:97:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):145:171 -> a
     98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():721:721 -> a
@@ -86267,9 +86354,9 @@ com.android.tools.r8.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.i
     232:232:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
     232:232:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):418 -> a
     233:233:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):420:420 -> a
-    234:234:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):875:875 -> a
+    234:234:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):887:887 -> a
     234:234:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):420 -> a
-    235:235:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):869:869 -> a
+    235:235:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):881:881 -> a
     235:235:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):420 -> a
     236:247:boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):429:440 -> a
     248:343:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):459:554 -> a
@@ -86286,7 +86373,7 @@ com.android.tools.r8.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.i
     2:13:int com.android.tools.r8.ir.optimize.DefaultInliningOracle.computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):241:252 -> b
     2:13:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):229 -> b
     14:21:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):230:237 -> b
-com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.internal.nL0:
+com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.internal.qL0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> c
@@ -86347,14 +86434,14 @@ com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.internal.
     320:320:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
     320:320:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):315 -> a
     321:323:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):315:317 -> a
-com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.internal.UM0:
+com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.internal.XM0:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():19:19 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):23:24 -> <init>
     1:15:com.android.tools.r8.ir.analysis.type.ClassTypeElement computeDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):46:60 -> a
     1:10:com.android.tools.r8.ir.analysis.type.TypeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):33:42 -> b
-com.android.tools.r8.ir.optimize.ForcedInliningOracle -> com.android.tools.r8.internal.MP0:
+com.android.tools.r8.ir.optimize.ForcedInliningOracle -> com.android.tools.r8.internal.PP0:
     java.util.Map invokesToInline -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.ProgramMethod method -> b
@@ -86373,7 +86460,7 @@ com.android.tools.r8.ir.optimize.ForcedInliningOracle -> com.android.tools.r8.in
     6:18:com.android.tools.r8.ir.optimize.Inliner$InlineAction com.android.tools.r8.ir.optimize.ForcedInliningOracle.computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):78:90 -> a
     6:18:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):71 -> a
     19:22:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):139:142 -> a
-com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.internal.dS0:
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.internal.gS0:
     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
@@ -86412,7 +86499,7 @@ com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.andr
     221:243:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):287:309 -> a
     244:244:boolean lambda$insertCanonicalizedInvokeWithInValues$6(com.android.tools.r8.ir.code.Instruction):304:304 -> a
     1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):214:214 -> b
-com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.internal.cS0:
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.internal.fS0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():97:97 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer):97:97 -> <init>
@@ -86422,7 +86509,7 @@ com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.an
     7:7:int hashCode(java.lang.Object):97:97 -> a
     8:8:int com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1.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.internal.KT0:
+com.android.tools.r8.ir.optimize.Inliner -> com.android.tools.r8.internal.NT0:
     com.android.tools.r8.shaking.MainDexInfo mainDexInfo -> d
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> c
@@ -86430,86 +86517,87 @@ com.android.tools.r8.ir.optimize.Inliner -> com.android.tools.r8.internal.KT0:
     com.android.tools.r8.androidapi.AvailableApiExceptions availableApiExceptions -> i
     boolean applyDoubleInlining -> e
     com.android.tools.r8.utils.collections.ProgramMethodSet doubleInlineSelectedTargets -> g
-    com.android.tools.r8.utils.collections.ProgramMethodSet doubleInlineCallers -> f
     java.util.Set extraNeverInlineMethods -> b
+    com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder doubleInlineCallers -> f
     java.util.Map doubleInlineeCandidates -> h
-    1:1:void <clinit>():80:80 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.LensCodeRewriter):98:98 -> <init>
-    2:24:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.LensCodeRewriter):88:110 -> <init>
+    1:1:void <clinit>():81:81 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.LensCodeRewriter):99:99 -> <init>
+    2:24:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.LensCodeRewriter):89:111 -> <init>
     boolean lambda$performInliningImpl$1(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
-    1:9:boolean neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):118:126 -> a
-    10:27:boolean neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):125:142 -> a
-    28:28:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():482:482 -> a
-    28:28:boolean neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):142 -> a
-    29:30:boolean neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):142:143 -> a
+    1:9:boolean neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):119:127 -> a
+    10:27:boolean neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):126:143 -> a
+    28:28:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():483:483 -> a
+    28:28:boolean neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):143 -> a
+    29:30:boolean neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):143:144 -> a
     31:31:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):298:298 -> a
-    31:31:boolean neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):143 -> a
-    32:32:boolean neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):139:139 -> a
-    33:33:boolean isDoubleInliningEnabled():151:151 -> a
-    34:40:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):191:197 -> a
+    31:31:boolean neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):144 -> a
+    32:32:boolean neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):140:140 -> a
+    33:33:boolean isDoubleInliningEnabled():152:152 -> a
+    34:40:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):192:198 -> a
     41:41:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():890:890 -> a
-    41:41:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):197 -> a
-    42:42:boolean isDoubleInlineSelectedTarget(com.android.tools.r8.graph.ProgramMethod):207:207 -> a
-    43:55:void recordDoubleInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):223:235 -> a
-    56:62:void performForcedInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):852:858 -> a
-    63:63:void performForcedInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):853:853 -> a
-    64:70:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):885:891 -> a
-    71:71:com.android.tools.r8.ir.optimize.DefaultInliningOracle com.android.tools.r8.ir.optimize.Inliner.createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):927:927 -> a
-    71:71:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):887 -> a
-    72:75:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):893:896 -> a
-    76:78:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy createDefaultInliningReasonStrategy(com.android.tools.r8.ir.conversion.MethodProcessor):901:903 -> a
-    79:79:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy lambda$createDefaultInliningReasonStrategy$0(com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):904:904 -> a
-    80:80:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int):918:918 -> a
-    81:81:com.android.tools.r8.ir.optimize.DefaultInliningOracle com.android.tools.r8.ir.optimize.Inliner.createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):927:927 -> a
-    81:81:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int):913 -> a
-    82:115:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):945:978 -> a
-    116:122:boolean com.android.tools.r8.ir.optimize.Inliner.tryInlineMethodWithoutSideEffects(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AssumeRemover):1117:1123 -> a
-    116:122:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):977 -> a
-    123:132:boolean com.android.tools.r8.ir.optimize.Inliner.tryInlineMethodWithoutSideEffects(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AssumeRemover):1122:1131 -> a
-    123:132:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):977 -> a
-    133:153:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):983:1003 -> a
-    154:164:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.Inliner.getDowncastTypeIfNeeded(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1154:1164 -> a
-    154:164:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1007 -> a
-    165:165:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1009:1009 -> a
-    166:166:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):35:35 -> a
-    166:166:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1009 -> a
-    167:176:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1010:1019 -> a
-    177:205:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1018:1046 -> a
-    206:232:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1045:1071 -> a
-    233:247:void com.android.tools.r8.ir.optimize.Inliner.postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.Timing):1177:1191 -> a
-    233:247:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1071 -> a
-    248:268:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1074:1094 -> a
-    269:271:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):109:111 -> a
-    269:271:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1094 -> a
-    272:272:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1095:1095 -> a
-    273:273:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):115:115 -> a
-    273:273:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1094 -> a
-    274:274:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    274:274:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1097 -> a
-    275:285:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1098:1108 -> a
-    286:292:boolean com.android.tools.r8.ir.optimize.Inliner.containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1136:1142 -> a
-    286:292:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):164 -> a
-    293:293:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    293:293:boolean com.android.tools.r8.ir.optimize.Inliner.containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1143 -> a
-    293:293:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):164 -> a
-    294:295:boolean com.android.tools.r8.ir.optimize.Inliner.containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1143:1144 -> a
-    294:295:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):164 -> a
-    296:308:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):165:177 -> a
-    309:311:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.Inliner.instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):156:158 -> a
-    309:311:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):179 -> a
-    312:312:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):185:185 -> a
-    313:316:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.utils.Timing):1201:1204 -> a
-    317:322:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1212:1217 -> a
-    323:323:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    323:323:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1217 -> a
-    324:326:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1217:1219 -> a
-    327:330:void rewindBlockIteratorToFirstInlineeBlock(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):1225:1228 -> a
-    1:7:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):212:218 -> b
-    8:9:com.android.tools.r8.utils.collections.ProgramMethodSet methodsToRevisit():241:242 -> b
-    10:15:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):802:807 -> b
-    16:16:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
-    16:16:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):813 -> b
-    17:24:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):819:826 -> b
+    41:41:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):198 -> a
+    42:42:boolean isDoubleInlineSelectedTarget(com.android.tools.r8.graph.ProgramMethod):208:208 -> a
+    43:56:void recordDoubleInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):224:237 -> a
+    57:59:void initializeDoubleInlineCallers(com.android.tools.r8.graph.GraphLens):242:244 -> a
+    60:62:void enqueueMethodsForReprocessing(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder):252:254 -> a
+    63:69:void performForcedInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):864:870 -> a
+    70:70:void performForcedInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):865:865 -> a
+    71:77:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):897:903 -> a
+    78:78:com.android.tools.r8.ir.optimize.DefaultInliningOracle com.android.tools.r8.ir.optimize.Inliner.createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):939:939 -> a
+    78:78:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):899 -> a
+    79:82:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):905:908 -> a
+    83:85:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy createDefaultInliningReasonStrategy(com.android.tools.r8.ir.conversion.MethodProcessor):913:915 -> a
+    86:86:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy lambda$createDefaultInliningReasonStrategy$0(com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):916:916 -> a
+    87:87:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int):930:930 -> a
+    88:88:com.android.tools.r8.ir.optimize.DefaultInliningOracle com.android.tools.r8.ir.optimize.Inliner.createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):939:939 -> a
+    88:88:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int):925 -> a
+    89:122:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):957:990 -> a
+    123:129:boolean com.android.tools.r8.ir.optimize.Inliner.tryInlineMethodWithoutSideEffects(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AssumeRemover):1129:1135 -> a
+    123:129:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):989 -> a
+    130:139:boolean com.android.tools.r8.ir.optimize.Inliner.tryInlineMethodWithoutSideEffects(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AssumeRemover):1134:1143 -> a
+    130:139:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):989 -> a
+    140:160:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):995:1015 -> a
+    161:171:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.Inliner.getDowncastTypeIfNeeded(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1166:1176 -> a
+    161:171:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1019 -> a
+    172:172:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1021:1021 -> a
+    173:173:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):35:35 -> a
+    173:173:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1021 -> a
+    174:183:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1022:1031 -> a
+    184:212:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1030:1058 -> a
+    213:239:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1057:1083 -> a
+    240:254:void com.android.tools.r8.ir.optimize.Inliner.postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.Timing):1189:1203 -> a
+    240:254:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1083 -> a
+    255:275:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1086:1106 -> a
+    276:278:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):109:111 -> a
+    276:278:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1106 -> a
+    279:279:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1107:1107 -> a
+    280:280:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):115:115 -> a
+    280:280:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1106 -> a
+    281:281:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    281:281:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1109 -> a
+    282:292:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1110:1120 -> a
+    293:299:boolean com.android.tools.r8.ir.optimize.Inliner.containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1148:1154 -> a
+    293:299:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):165 -> a
+    300:300:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    300:300:boolean com.android.tools.r8.ir.optimize.Inliner.containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1155 -> a
+    300:300:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):165 -> a
+    301:302:boolean com.android.tools.r8.ir.optimize.Inliner.containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1155:1156 -> a
+    301:302:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):165 -> a
+    303:315:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):166:178 -> a
+    316:318:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.Inliner.instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):157:159 -> a
+    316:318:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):180 -> a
+    319:319:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):186:186 -> a
+    320:323:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.utils.Timing):1213:1216 -> a
+    324:329:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1224:1229 -> a
+    330:330:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    330:330:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1229 -> a
+    331:333:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1229:1231 -> a
+    334:337:void rewindBlockIteratorToFirstInlineeBlock(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):1237:1240 -> a
+    1:7:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):213:219 -> b
+    8:13:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):814:819 -> b
+    14:14:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
+    14:14:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):825 -> b
+    15:22:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):831:838 -> b
 com.android.tools.r8.ir.optimize.Inliner$Constraint -> com.android.tools.r8.ir.optimize.a:
     com.android.tools.r8.ir.optimize.Inliner$Constraint PACKAGE -> e
     com.android.tools.r8.ir.optimize.Inliner$Constraint SAMENEST -> d
@@ -86519,88 +86607,88 @@ com.android.tools.r8.ir.optimize.Inliner$Constraint -> com.android.tools.r8.ir.o
     com.android.tools.r8.ir.optimize.Inliner$Constraint ALWAYS -> g
     int value -> a
     com.android.tools.r8.ir.optimize.Inliner$Constraint SUBCLASS -> f
-    1:18:void <clinit>():252:252 -> <clinit>
-    43:47:void <clinit>():277:281 -> <clinit>
-    1:2:void <init>(java.lang.String,int,int):272:273 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():252:252 -> a
-    1:1:boolean isSet(int):292:292 -> d
+    1:18:void <clinit>():264:264 -> <clinit>
+    43:47:void <clinit>():289:293 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int):284:285 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():264:264 -> a
+    1:1:boolean isSet(int):304:304 -> d
 com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget -> com.android.tools.r8.ir.optimize.b:
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget ALWAYS -> d
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget NEVER -> c
     com.android.tools.r8.ir.optimize.Inliner$Constraint constraint -> a
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType targetHolder -> b
-    1:9:void <clinit>():310:318 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):320:323 -> <init>
-    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):326:330 -> <init>
-    1:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):353:376 -> a
-    25:36:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):382:393 -> 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):398:448 -> a
-    88:98:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):525:535 -> 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):448 -> 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):449:456 -> a
-    107:122:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):502:517 -> 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):456 -> a
-    123:156: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):460:493 -> a
-    1:5:boolean equals(java.lang.Object):343:347 -> equals
-    1:4:int hashCode():335:338 -> hashCode
+    1:9:void <clinit>():322:330 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):332:335 -> <init>
+    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):338:342 -> <init>
+    1:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):365:388 -> a
+    25:36:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):394:405 -> 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):410:460 -> a
+    88:98:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):537:547 -> a
+    88:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):460 -> 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):461:468 -> a
+    107:122:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):514:529 -> a
+    107:122:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):468 -> a
+    123:156: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):472:505 -> a
+    1:5:boolean equals(java.lang.Object):355:359 -> equals
+    1:4:int hashCode():347:350 -> hashCode
     5:5:int com.android.tools.r8.graph.DexType.computeHashCode():109:109 -> hashCode
-    5:5:int hashCode():338 -> hashCode
-com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.internal.GT0:
+    5:5:int hashCode():350 -> hashCode
+com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.internal.JT0:
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> c
     boolean shouldSynthesizeNullCheckForReceiver -> e
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.ProgramMethod target -> a
     com.android.tools.r8.ir.code.Invoke invoke -> b
     boolean shouldSynthesizeInitClass -> d
-    1:1:void <clinit>():561:561 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):570:573 -> <init>
-    1:2:void setShouldSynthesizeInitClass():577:578 -> a
-    3:11:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):592:600 -> a
-    12:23:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeInitClass(com.android.tools.r8.ir.code.IRCode):745:756 -> a
-    12:23:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):601 -> a
-    24:25:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):611:612 -> a
-    26:26:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():489:489 -> a
-    26:26:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):612 -> a
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    27:27:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):612 -> a
-    28:30:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):613:615 -> a
-    31:54:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod):761:784 -> a
-    31:54:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):617 -> a
-    55:57:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):622:624 -> a
-    58:64:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):623:629 -> a
+    1:1:void <clinit>():573:573 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):582:585 -> <init>
+    1:2:void setShouldSynthesizeInitClass():589:590 -> a
+    3:11:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):604:612 -> a
+    12:23:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeInitClass(com.android.tools.r8.ir.code.IRCode):757:768 -> a
+    12:23:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):613 -> a
+    24:25:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):623:624 -> a
+    26:26:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():431:431 -> a
+    26:26:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):624 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    27:27:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):624 -> a
+    28:30:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):625:627 -> a
+    31:54:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod):773:796 -> a
+    31:54:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):629 -> a
+    55:57:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):634:636 -> a
+    58:64:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):635:641 -> a
     65:65:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1172:1172 -> a
-    65:65:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):630 -> a
-    66:76:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):630:640 -> a
+    65:65:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):642 -> a
+    66:76:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):642:652 -> a
     77:77:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1172:1172 -> a
-    77:77:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):645 -> a
-    78:78:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):645:645 -> a
-    79:86:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):644:651 -> a
-    87:100:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):649:662 -> a
+    77:77:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):657 -> a
+    78:78:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):657:657 -> a
+    79:86:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):656:663 -> a
+    87:100:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):661:674 -> a
     101:101:com.android.tools.r8.ir.code.Phi com.android.tools.r8.ir.code.IRCode.createPhi(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeElement):1168:1168 -> a
-    101:101:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):664 -> a
-    102:141:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):665:704 -> a
-    142:180:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):703:741 -> a
-    181:181:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$0(com.android.tools.r8.ir.code.BasicBlock):667:667 -> a
-    1:2:void setShouldSynthesizeNullCheckForReceiver():582:583 -> b
-com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.internal.HT0:
+    101:101:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):676 -> a
+    102:141:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):677:716 -> a
+    142:180:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):715:753 -> a
+    181:181:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$0(com.android.tools.r8.ir.code.BasicBlock):679:679 -> a
+    1:2:void setShouldSynthesizeNullCheckForReceiver():594:595 -> b
+com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.internal.KT0:
     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):794:796 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.internal.IT0:
+    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):806:808 -> <init>
+com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.internal.LT0:
     com.android.tools.r8.graph.DexType receiverType -> b
     com.android.tools.r8.graph.ProgramMethod target -> a
-    1:3:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):840:842 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.internal.JT0:
+    1:3:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):852:854 -> <init>
+com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.internal.MT0:
     com.android.tools.r8.ir.optimize.Inliner$Reason SIMPLE -> e
     com.android.tools.r8.ir.optimize.Inliner$Reason NEVER -> f
     com.android.tools.r8.ir.optimize.Inliner$Reason SINGLE_CALLER -> c
     com.android.tools.r8.ir.optimize.Inliner$Reason DUAL_CALLER -> d
     com.android.tools.r8.ir.optimize.Inliner$Reason FORCE -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason ALWAYS -> b
-    1:6:void <clinit>():548:553 -> <clinit>
-    1:1:void <init>(java.lang.String,int):547:547 -> <init>
-    1:1:boolean mustBeInlined():557:557 -> a
+    1:6:void <clinit>():560:565 -> <clinit>
+    1:1:void <init>(java.lang.String,int):559:559 -> <init>
+    1:1:boolean mustBeInlined():569:569 -> a
 com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.ir.optimize.c:
     com.android.tools.r8.graph.AppView appView -> a
     boolean allowStaticInterfaceMethodCalls -> b
@@ -86676,12 +86764,12 @@ com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.ir.
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):196:196 -> f
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):287:287 -> g
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):295:295 -> h
-com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.internal.NT0:
+com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.internal.QT0:
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean isForcedInliningOracle() -> a
     com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod) -> a
     boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
-com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.internal.PT0:
+com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.internal.ST0:
     boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback) -> a
@@ -86689,7 +86777,7 @@ com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.intern
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
     boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
-com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.internal.zU0:
+com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.internal.CU0:
     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
@@ -86697,7 +86785,7 @@ com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.
     3:12:int com.android.tools.r8.ir.optimize.InstructionEquivalence.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.internal.O61:
+com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.internal.R61:
     com.android.tools.r8.graph.DexClass clazz -> a
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
     java.util.Set interfaces -> d
@@ -86735,7 +86823,7 @@ com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.
     1:1:boolean hasSeenStrictlyBelow(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):212:212 -> d
     2:2:java.lang.Boolean lambda$hasSeenStrictlyBelow$3(com.android.tools.r8.graph.DexClass,java.lang.Boolean):212:212 -> d
     1:2:void seen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):195:196 -> e
-com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.internal.b71:
+com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.internal.e71:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set warnedFields -> c
@@ -86744,112 +86832,120 @@ com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.
     1:3:void <clinit>():51:53 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):61:61 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.AppView):59:63 -> <init>
-    1:12:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):84:95 -> a
-    1:12:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
-    13:13:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createNullValue():37:37 -> a
-    13:13:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):96 -> a
-    13:13:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
-    14:34:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):96:116 -> a
-    14:34:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
-    35:46:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):113:124 -> a
-    35:46:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
-    47:50:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):123:126 -> a
-    47:50:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
-    51:51:com.android.tools.r8.ir.code.StaticGet$Builder com.android.tools.r8.ir.code.StaticGet.builder():42:42 -> a
-    51:51:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):126 -> a
-    51:51:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
-    52:52:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):127:127 -> a
-    52:52:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> a
-    53:53:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexField.getTypeElement(com.android.tools.r8.graph.AppView):66 -> a
-    53:53:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):128 -> a
-    53:53:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
-    54:54:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexField.getTypeElement(com.android.tools.r8.graph.AppView):66:66 -> a
-    54:54:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):128 -> a
-    54:54:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
-    55:69:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):128:142 -> a
-    55:69:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
-    70:70:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):137:137 -> a
-    70:70:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
-    71:72:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):170:171 -> a
-    73:75:void com.android.tools.r8.ir.optimize.MemberValuePropagation.setValueRangeFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.Value):154:156 -> a
-    73:75:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):171 -> a
-    76:85:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):175:184 -> a
-    86:86:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    86:86:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):186 -> a
-    87:87:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):187:187 -> a
-    88:88:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    88:88:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):188 -> a
-    89:91:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):189:191 -> a
-    92:113:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):190:211 -> a
-    114:122:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):305:313 -> a
-    123:132:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):312:321 -> a
-    133:133:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> a
-    133:133:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):322 -> a
-    134:134:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    134:134:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):322 -> a
-    135:135:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
-    135:135:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndField):67 -> a
-    135:135:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):326 -> a
-    136:139:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndField):68:71 -> a
-    136:139:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):326 -> a
-    140:142:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):331:333 -> a
-    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> a
-    143:143:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):338 -> a
-    144:148:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):338:342 -> a
-    149:149:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> a
-    149:149:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):342 -> a
-    150:156:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):344:350 -> a
-    157:157:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> a
-    157:157:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):353 -> a
-    158:162:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):355:359 -> a
-    163:186:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):357:380 -> a
-    187:187:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    187:187:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):384 -> a
-    188:192:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):385:389 -> a
-    193:208:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):388:403 -> a
-    209:209:java.lang.Boolean lambda$rewriteFieldGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):313:313 -> a
-    210:217:void run(com.android.tools.r8.ir.code.IRCode):448:455 -> a
-    218:218:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    218:218:void run(com.android.tools.r8.ir.code.IRCode):455 -> a
-    219:222:void run(com.android.tools.r8.ir.code.IRCode):455:458 -> a
-    223:234:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):466:477 -> a
-    235:254:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):223:242 -> a
-    235:254:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):476 -> a
-    255:255:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    255:255:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):75 -> a
-    255:255:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):247 -> a
-    255:255:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):476 -> a
-    256:259:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):76:79 -> a
-    256:259:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):247 -> a
-    256:259:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):476 -> a
-    260:261:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):252:253 -> a
-    260:261:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):476 -> a
-    262:262:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createNullValue():37:37 -> a
-    262:262:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):253 -> a
-    262:262:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):476 -> a
-    263:285:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):256:278 -> a
-    263:285:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):476 -> a
-    286:302:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):277:293 -> a
-    286:302:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):476 -> a
-    303:305:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):478:480 -> a
-    306:309:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):479:482 -> a
-    310:310:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):410:410 -> a
-    310:310:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):482 -> a
-    311:311:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> a
-    311:311:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):411 -> a
-    311:311:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):482 -> a
-    312:316:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):418:422 -> a
-    312:316:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):482 -> a
-    317:318:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):483:484 -> a
-    319:319:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):427:427 -> a
-    319:319:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):484 -> a
-    320:320:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> a
-    320:320:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):428 -> a
-    320:320:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):484 -> a
-    321:325:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):435:439 -> a
-    321:325:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):484 -> a
-com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.internal.L71:
+    1:14:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):84:97 -> a
+    1:14:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
+    15:15:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
+    15:15:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):97 -> a
+    15:15:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
+    16:18:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):101:103 -> a
+    16:18:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
+    19:19:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
+    19:19:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):103 -> a
+    19:19:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
+    20:30:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):106:116 -> a
+    20:30:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
+    31:42:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):113:124 -> a
+    31:42:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
+    43:46:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):123:126 -> a
+    43:46:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
+    47:47:com.android.tools.r8.ir.code.StaticGet$Builder com.android.tools.r8.ir.code.StaticGet.builder():42:42 -> a
+    47:47:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):126 -> a
+    47:47:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
+    48:48:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):127:127 -> a
+    48:48:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> a
+    49:49:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexField.getTypeElement(com.android.tools.r8.graph.AppView):66 -> a
+    49:49:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):128 -> a
+    49:49:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
+    50:50:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexField.getTypeElement(com.android.tools.r8.graph.AppView):66:66 -> a
+    50:50:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):128 -> a
+    50:50:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
+    51:65:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):128:142 -> a
+    51:65:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
+    66:66:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.MemberValuePropagation.createReplacementFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):137:137 -> a
+    66:66:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):167 -> a
+    67:68:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):170:171 -> a
+    69:71:void com.android.tools.r8.ir.optimize.MemberValuePropagation.setValueRangeFromAssumeInfo(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo,com.android.tools.r8.ir.code.Value):154:156 -> a
+    69:71:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):171 -> a
+    72:81:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):175:184 -> a
+    82:82:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    82:82:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):186 -> a
+    83:83:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):187:187 -> a
+    84:84:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    84:84:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):188 -> a
+    85:87:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):189:191 -> a
+    88:109:boolean applyAssumeInfoIfPossible(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.assume.AssumeInfo):190:211 -> a
+    110:118:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):305:313 -> a
+    119:128:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):312:321 -> a
+    129:129:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> a
+    129:129:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):322 -> a
+    130:130:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    130:130:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):322 -> a
+    131:131:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
+    131:131:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndField):67 -> a
+    131:131:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):326 -> a
+    132:135:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndField):68:71 -> a
+    132:135:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):326 -> a
+    136:138:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):331:333 -> a
+    139:139:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> a
+    139:139:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):338 -> a
+    140:144:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):338:342 -> a
+    145:145:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> a
+    145:145:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):342 -> a
+    146:152:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):344:350 -> a
+    153:153:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> a
+    153:153:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):353 -> a
+    154:158:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):355:359 -> a
+    159:179:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):357:377 -> a
+    180:180:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
+    180:180:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):378 -> a
+    181:182:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):379:380 -> a
+    183:183:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    183:183:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):384 -> a
+    184:188:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):385:389 -> a
+    189:204:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):388:403 -> a
+    205:205:java.lang.Boolean lambda$rewriteFieldGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):313:313 -> a
+    206:213:void run(com.android.tools.r8.ir.code.IRCode):448:455 -> a
+    214:214:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    214:214:void run(com.android.tools.r8.ir.code.IRCode):455 -> a
+    215:218:void run(com.android.tools.r8.ir.code.IRCode):455:458 -> a
+    219:230:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):466:477 -> a
+    231:250:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):223:242 -> a
+    231:250:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):476 -> a
+    251:251:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    251:251:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):75 -> a
+    251:251:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):247 -> a
+    251:251:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):476 -> a
+    252:255:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):76:79 -> a
+    252:255:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):247 -> a
+    252:255:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):476 -> a
+    256:271:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):252:267 -> a
+    256:271:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):476 -> a
+    272:272:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
+    272:272:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):268 -> a
+    272:272:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):476 -> a
+    273:282:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):269:278 -> a
+    273:282:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):476 -> a
+    283:299:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):277:293 -> a
+    283:299:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):476 -> a
+    300:302:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):478:480 -> a
+    303:306:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):479:482 -> a
+    307:307:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):410:410 -> a
+    307:307:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):482 -> a
+    308:308:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> a
+    308:308:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):411 -> a
+    308:308:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):482 -> a
+    309:313:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):418:422 -> a
+    309:313:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):482 -> a
+    314:315:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):483:484 -> a
+    316:316:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):427:427 -> a
+    316:316:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):484 -> a
+    317:317:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> a
+    317:317:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):428 -> a
+    317:317:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):484 -> a
+    318:322:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):435:439 -> a
+    318:322:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):484 -> a
+com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.internal.O71:
     java.util.Map com.android.tools.r8.ir.optimize.MemberPoolCollection.memberPools -> d
     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
@@ -86925,7 +87021,7 @@ com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.in
     27:27:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):155:155 -> d
     28:28:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):273:273 -> d
     28:28:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):155 -> d
-com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.internal.B81:
+com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.internal.E81:
     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>
@@ -86933,12 +87029,12 @@ com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.internal
     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.internal.A91:
+com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.internal.D91:
     com.android.tools.r8.graph.AppView appView -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):35:36 -> <init>
     1:2:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):40:41 -> a
     3:3:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1719:1719 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():514 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():520 -> a
     3:3:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):41 -> a
     4:9:void com.android.tools.r8.ir.optimize.NestReducer.removeNests():50:55 -> a
     4:9:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):42 -> a
@@ -86961,7 +87057,7 @@ com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.internal.A9
     8:8:void processNestHost(com.android.tools.r8.graph.DexProgramClass):93 -> b
     9:10:void processNestHost(com.android.tools.r8.graph.DexProgramClass):93:94 -> b
     1:4:void processNestMember(com.android.tools.r8.graph.DexProgramClass):99:102 -> c
-com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.internal.B91:
+com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.internal.E91:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:14:boolean sameNest(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):28:41 -> a
@@ -86984,7 +87080,7 @@ com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.internal.B91:
     43:53:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):73:83 -> a
     54:54:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
     54:54:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):78 -> a
-com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.internal.Ud1:
+com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.internal.Xd1:
     java.util.List candidateMethodLists -> a
     java.util.Map outlineSites -> b
     java.util.Map generatedOutlines -> c
@@ -87019,7 +87115,7 @@ com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.internal.Ud1:
     57:57:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext lambda$buildOutlineMethods$2(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):1344:1344 -> a
     58:58:void lambda$buildOutlineMethods$4(com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1355:1355 -> a
     59:64:void lambda$buildOutlineMethods$4(com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1354:1359 -> a
-    65:65:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    65:65:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     65:65:void lambda$buildOutlineMethods$4(com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1359 -> a
     66:66:void lambda$buildOutlineMethods$4(com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1361:1361 -> a
     67:67:void lambda$buildOutlineMethods$4(com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1360:1360 -> a
@@ -87046,7 +87142,7 @@ com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.internal.Ud1:
     2:3:java.util.function.Consumer getOutlineMethodIdentifierGenerator():1301:1302 -> d
     1:1:java.util.Map access$400(com.android.tools.r8.ir.optimize.Outliner):105:105 -> e
     2:10:com.android.tools.r8.utils.collections.ProgramMethodSet selectMethodsForOutlining():1315:1323 -> e
-com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.internal.Id1:
+com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.internal.Ld1:
     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):207:208 -> <init>
     1:1:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):212:212 -> a
@@ -87093,7 +87189,7 @@ com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():179:179 -> hashCode
     1:1:int hashCode():219 -> hashCode
     2:2:int hashCode():219:219 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.internal.Jd1:
+com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.internal.Md1:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> d
     com.android.tools.r8.graph.DexProto proto -> f
     boolean hasOutValue -> e
@@ -87130,7 +87226,7 @@ com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.androi
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():179:179 -> hashCode
     1:1:int hashCode():407 -> hashCode
     2:6:int hashCode():407:411 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.internal.Kd1:
+com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.internal.Nd1:
     com.android.tools.r8.graph.DexType clazz -> c
     1:2:void <init>(com.android.tools.r8.graph.DexType):309:310 -> <init>
     1:1:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):330:330 -> a
@@ -87149,7 +87245,7 @@ com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.a
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():179:179 -> hashCode
     1:1:int hashCode():325 -> hashCode
     2:2:int hashCode():325:325 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.internal.Ld1:
+com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.internal.Od1:
     java.util.List argumentMap -> b
     java.util.List argumentTypes -> a
     com.android.tools.r8.graph.DexProto proto -> e
@@ -87173,7 +87269,7 @@ com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.intern
     1:18:boolean equals(java.lang.Object):579:596 -> equals
     1:6:int hashCode():604:609 -> hashCode
     1:37:java.lang.String toString():665:701 -> toString
-com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.internal.Md1:
+com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.internal.Pd1:
     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):1567:1568 -> <init>
@@ -87187,7 +87283,7 @@ com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.in
     4:4:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):1615:1615 -> a
     1:1:boolean computeEquals(java.lang.Object):1625:1625 -> g
     1:1:java.lang.String toString():1605:1605 -> toString
-com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.internal.Od1:
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.internal.Rd1:
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():120:120 -> <clinit>
@@ -87199,20 +87295,20 @@ com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tool
     java.lang.String getInstructionName() -> b
     boolean hasOutValue() -> c
     int numberOfInputs() -> d
-com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Nd1:
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Qd1:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String name(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> b
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.internal.Pd1:
+com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.internal.Sd1:
     java.util.Map candidateMap -> q
     com.android.tools.r8.ir.optimize.Outliner this$0 -> r
     1:3:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.BasicBlock,java.util.Map):1142:1144 -> <init>
     1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1149:1151 -> a
     4:5:com.android.tools.r8.utils.collections.LongLivedProgramMethodMultisetBuilder addOutlineMethodList(com.android.tools.r8.ir.optimize.Outliner$Outline):1155:1156 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.internal.Qd1:
+com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.internal.Td1:
     java.util.ListIterator blocksIterator -> r
     java.util.List toRemove -> s
     com.android.tools.r8.ir.code.IRCode code -> q
@@ -87223,17 +87319,17 @@ com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r
     1:5:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.List):1187:1191 -> <init>
     1:60:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1196:1255 -> a
     61:63:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1262:1264 -> a
-    64:68:java.util.Optional com.android.tools.r8.utils.ListUtils.removeFirstMatch(java.util.List,java.util.function.Predicate):200:204 -> a
+    64:68:java.util.Optional com.android.tools.r8.utils.ListUtils.removeFirstMatch(java.util.List,java.util.function.Predicate):208:212 -> a
     64:68:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1263 -> a
     69:69:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1266:1266 -> a
     70:74:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1263:1267 -> a
     75:75:boolean lambda$removeMethodFromOutlineList$0(com.android.tools.r8.graph.ProgramMethod):1265:1265 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.internal.Rd1:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.internal.Ud1:
     com.android.tools.r8.ir.optimize.Outliner this$0 -> q
     1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.BasicBlock):1163:1164 -> <init>
     1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1169:1171 -> a
     4:4:java.util.List lambda$handle$0(com.android.tools.r8.ir.optimize.Outliner$Outline):1170:1170 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.internal.Sd1:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.internal.Vd1:
     com.android.tools.r8.ir.optimize.Outliner this$0 -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.code.Position position -> b
@@ -87266,7 +87362,7 @@ com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools
     1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():1543:1543 -> e
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
-com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.internal.Td1:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.internal.Wd1:
     int pendingNewInstanceIndex -> n
     com.android.tools.r8.graph.DexType returnType -> k
     int returnValueUniqueUsersLeft -> m
@@ -87336,7 +87432,7 @@ com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8
     159:188:void candidate(int,int):1085:1114 -> a
     1:1:void invalidateInstructionArray():743:743 -> b
     2:8:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):929:935 -> b
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> b
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> b
     9:9:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):935 -> b
     10:16:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):938:944 -> b
     17:27:void reset(int):1119:1129 -> b
@@ -87379,7 +87475,7 @@ com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8
     101:101:void process():753 -> c
     102:112:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):802:812 -> c
     102:112:void process():753 -> c
-com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.internal.pe1:
+com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.internal.se1:
     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
@@ -87427,7 +87523,7 @@ com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.inter
     287:287:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):297 -> a
     288:305:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.PeepholeOptimizer.createAndInsertBlockForSuffix(int,int,java.util.List,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator):338:355 -> a
     288:305:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):297 -> a
-    306:306:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1594:1594 -> a
+    306:306:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
     306:306:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.PeepholeOptimizer.createAndInsertBlockForSuffix(int,int,java.util.List,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator):356 -> a
     306:306:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):297 -> a
     307:336:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.PeepholeOptimizer.createAndInsertBlockForSuffix(int,int,java.util.List,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator):357:386 -> a
@@ -87442,18 +87538,18 @@ com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.inter
     359:359:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap localsAtBlockExit(com.android.tools.r8.ir.code.BasicBlock):398 -> a
     360:360:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap localsAtBlockExit(com.android.tools.r8.ir.code.BasicBlock):399:399 -> a
     361:381:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):431:451 -> a
-    382:383:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1594:1594 -> a
+    382:383:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
     382:383:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):452 -> a
     384:384:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):452:452 -> a
     385:399:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):451:465 -> a
-    400:400:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1594:1594 -> a
+    400:400:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
     400:400:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):466 -> a
     401:404:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):466:469 -> a
     405:407:void removeWideConstantCovering(java.util.Map,int):542:544 -> 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):271:271 -> b
-com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.internal.se1:
+com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.internal.ve1:
     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
@@ -87480,7 +87576,7 @@ com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.intern
     38:49:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
     50:63:boolean com.android.tools.r8.ir.optimize.PhiOptimizations.tryMovePhiToStack(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Phi,java.util.Set):160:173 -> b
     50:63:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.tools.r8.internal.Si1:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.tools.r8.internal.Qi1:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState activeState -> g
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates activeStates -> f
@@ -87495,17 +87591,17 @@ com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.to
     1:1:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
     1:1:boolean isFinal(com.android.tools.r8.graph.DexClassAndField):157 -> a
     2:2:boolean isFinal(com.android.tools.r8.graph.DexClassAndField):160:160 -> a
-    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():237:237 -> a
+    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():203:203 -> a
     3:3:boolean isFinal(com.android.tools.r8.graph.DexClassAndField):160 -> a
     4:6:boolean isFinal(com.android.tools.r8.graph.DexClassAndField):161:163 -> a
     7:7:java.util.Set access$000(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination):55:55 -> a
     8:27:void handleInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect):343:362 -> a
     28:28:void handleInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect):350:350 -> a
     29:36:void lambda$handleInvokeDirect$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):365:372 -> a
-    37:37:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():237:237 -> a
+    37:37:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():203:203 -> a
     37:37:void lambda$handleInvokeDirect$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):373 -> a
     38:46:void lambda$handleInvokeDirect$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):374:382 -> a
-    47:47:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():237:237 -> a
+    47:47:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():203:203 -> a
     47:47:void lambda$handleInvokeDirect$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):383 -> a
     48:55:void lambda$handleInvokeDirect$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):384:391 -> a
     56:56:void applyObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.ObjectState):429:429 -> a
@@ -87534,7 +87630,7 @@ com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.to
     34:34:void run():207 -> b
     35:46:void run():208:219 -> b
     47:60:void run():218:231 -> b
-    61:61:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():237:237 -> b
+    61:61:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():203:203 -> b
     61:61:void run():231 -> b
     62:63:void run():231:232 -> b
     64:67:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.verifyWasInstanceInitializer():331:334 -> b
@@ -87558,7 +87654,7 @@ com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.to
     94:94:void run():239 -> b
     95:105:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):409:419 -> b
     95:105:void run():239 -> b
-    106:106:boolean com.android.tools.r8.graph.AppView.hasLiveness():611:611 -> b
+    106:106:boolean com.android.tools.r8.graph.AppView.hasLiveness():616:616 -> b
     106:106:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):419 -> b
     106:106:void run():239 -> b
     107:109:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):421:423 -> b
@@ -87608,20 +87704,20 @@ com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.to
     176:179:void run():307:310 -> b
     180:206:void run():285:311 -> b
     207:207:void run():271:271 -> b
-    208:208:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessorWithUniquePredecessor():216:216 -> b
+    208:208:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessorWithUniquePredecessor():220:220 -> b
     208:208:void run():314 -> b
     209:219:void run():315:325 -> b
     220:220:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> b
     220:220:void run():325 -> b
     221:223:void run():325:327 -> b
     224:224:java.lang.Boolean lambda$run$0(com.android.tools.r8.graph.DexClassAndField):249:249 -> b
-    225:225:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():237:237 -> b
+    225:225:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():203:203 -> b
     225:225:java.lang.Boolean lambda$run$0(com.android.tools.r8.graph.DexClassAndField):249 -> b
     226:228:java.lang.Boolean lambda$run$0(com.android.tools.r8.graph.DexClassAndField):249:249 -> b
     1:1:com.android.tools.r8.graph.ProgramMethod access$200(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination):55:55 -> c
     1:1:com.android.tools.r8.ir.code.IRCode access$300(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination):55:55 -> d
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.internal.Li1:
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState -> com.android.tools.r8.internal.Mi1:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.internal.Ji1:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState -> com.android.tools.r8.internal.Ki1:
     java.util.LinkedHashMap finalInstanceFieldValues -> a
     java.util.LinkedHashMap nonFinalInstanceFieldValues -> d
     java.util.LinkedHashMap nonFinalStaticFieldValues -> e
@@ -87684,7 +87780,7 @@ com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState -> com
     3:3:int com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.size(java.util.Set):868:868 -> e
     3:3:int size():862 -> e
     4:6:int size():862:864 -> e
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates -> com.android.tools.r8.internal.Ni1:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates -> com.android.tools.r8.internal.Li1:
     java.util.LinkedHashMap activeStateAtExit -> a
     int capacity -> b
     boolean $assertionsDisabled -> c
@@ -87701,20 +87797,20 @@ com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates -> co
     43:43:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):566 -> a
     44:46:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):567:569 -> a
     47:51:void removeState(com.android.tools.r8.ir.code.BasicBlock):573:577 -> a
-    52:52:boolean com.android.tools.r8.ir.code.BasicBlock.isEntry():605:605 -> a
+    52:52:boolean com.android.tools.r8.ir.code.BasicBlock.isEntry():609:609 -> a
     52:52:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock,int):480 -> a
     53:75:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock,int):481:503 -> a
     76:76:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> a
     76:76:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock,int):504 -> a
     77:77:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock,int):505:505 -> a
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$ExistingValue -> com.android.tools.r8.internal.Oi1:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$ExistingValue -> com.android.tools.r8.internal.Mi1:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination this$0 -> b
     com.android.tools.r8.ir.code.Value value -> a
     1:1:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1):92:92 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination,com.android.tools.r8.ir.code.Value):96:97 -> <init>
     1:4:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):102:105 -> a
     1:1:java.lang.String toString():110:110 -> toString
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.internal.Pi1:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.internal.Ni1:
     com.android.tools.r8.graph.DexField field -> a
     com.android.tools.r8.ir.code.Value object -> b
     boolean $assertionsDisabled -> c
@@ -87724,9 +87820,9 @@ com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject ->
     1:1:com.android.tools.r8.graph.DexField access$800(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):131:131 -> a
     1:5:boolean equals(java.lang.Object):148:152 -> equals
     1:1:int hashCode():143:143 -> hashCode
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue -> com.android.tools.r8.internal.Qi1:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue -> com.android.tools.r8.internal.Oi1:
     void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction) -> a
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$MaterializableValue -> com.android.tools.r8.internal.Ri1:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$MaterializableValue -> com.android.tools.r8.internal.Pi1:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination this$0 -> b
     com.android.tools.r8.ir.analysis.value.SingleValue value -> a
     boolean $assertionsDisabled -> c
@@ -87734,8 +87830,10 @@ com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$MaterializableVal
     1:1:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination,com.android.tools.r8.ir.analysis.value.SingleValue,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1):114:114 -> <init>
     2:4:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination,com.android.tools.r8.ir.analysis.value.SingleValue):118:120 -> <init>
     1:3:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):125:127 -> a
-    4:4:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):126:126 -> a
-com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.internal.xk1:
+    4:4:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
+    4:4:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):127 -> a
+    5:5:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):126:126 -> a
+com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.internal.vk1:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():35:35 -> <clinit>
     1:21:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:61 -> a
@@ -87774,12 +87872,12 @@ com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.int
     156:163:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):89:96 -> a
     164:201:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):95:132 -> a
     202:216:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):131:145 -> a
-    217:217:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    217:217:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     217:217:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):145 -> a
     218:220:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):146:148 -> a
     221:221:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):147:147 -> a
     222:224:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):121:123 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.internal.Am1:
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.internal.sm1:
     java.util.List serviceLoadMethods -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):66:66 -> <init>
@@ -87794,7 +87892,7 @@ com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.i
     32:94:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):109:171 -> a
     95:107:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):170:182 -> a
     108:109:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):174:175 -> a
-    110:110:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    110:110:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     110:110:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):175 -> a
     111:111:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):176:176 -> a
     112:118:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):190:196 -> a
@@ -87818,7 +87916,7 @@ com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.i
     221:221:com.android.tools.r8.graph.Code lambda$createSynthesizedMethod$1(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexMethod):204 -> a
     222:250:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):90:118 -> a
     222:250:com.android.tools.r8.graph.Code lambda$createSynthesizedMethod$1(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexMethod):204 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.internal.zm1:
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.internal.rm1:
     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
@@ -87835,7 +87933,7 @@ com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.t
     31:31:void lambda$perform$0(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.ir.code.Instruction):258 -> a
     32:33:void lambda$perform$0(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.ir.code.Instruction):258:259 -> a
     34:34:boolean lambda$perform$1(com.android.tools.r8.ir.code.Instruction):263:263 -> a
-com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.internal.Qp1:
+com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.internal.Ip1:
     com.android.tools.r8.ir.code.BasicBlock alwaysHitTarget -> f
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
@@ -87912,7 +88010,7 @@ com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.in
     97:98:boolean optimize():105 -> f
     99:99:void com.android.tools.r8.ir.optimize.SwitchCaseEliminator.replaceSwitchByGoto():153:153 -> f
     99:99:boolean optimize():105 -> f
-com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.internal.Rp1:
+com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.internal.Jp1:
     com.android.tools.r8.graph.DexString switchMapPrefix -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString kotlinSwitchMapPrefix -> c
@@ -87941,7 +88039,7 @@ com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.inte
     83:83:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
     83:83:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):167 -> a
     84:84:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):167:167 -> a
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> com.android.tools.r8.internal.Tr1:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> com.android.tools.r8.internal.Lr1:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> b
     boolean $assertionsDisabled -> c
@@ -87973,16 +88071,16 @@ com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> com.android.t
     239:244:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):292:297 -> a
     245:245:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):296:296 -> a
     246:246:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):294:294 -> a
-    247:251:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):322:326 -> a
-    1:15:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):303:317 -> b
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLens -> com.android.tools.r8.internal.Sr1:
+    247:251:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):325:329 -> a
+    1:18:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):303:320 -> b
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLens -> com.android.tools.r8.internal.Kr1:
     boolean $assertionsDisabled -> o
     java.util.Map removedArgumentsInfoPerMethod -> n
     1:1:void <clinit>():50:50 -> <clinit>
     1:2:void <init>(com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,java.util.Map,com.android.tools.r8.graph.AppView):58:59 -> <init>
     1:11:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):65:75 -> a
     12:12:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):74:74 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r8.internal.os1:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r8.internal.gs1:
     com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map removedArguments -> d
@@ -88016,25 +88114,25 @@ com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r
     1:8:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):196:203 -> b
     1:6:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):233:238 -> c
     1:1:java.lang.Runnable runnableForClass(com.android.tools.r8.graph.DexProgramClass):192:192 -> d
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.internal.js1:
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.internal.ks1:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.internal.bs1:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.internal.cs1:
     java.util.BitSet used -> a
     1:3:void <init>():319:321 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):319:319 -> <init>
     1:1:java.util.BitSet getUsedArguments():324:324 -> a
     2:2:boolean register(int):329:329 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.internal.ls1:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.internal.ds1:
     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):156:157 -> <init>
     1:14:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):166:179 -> 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.RewrittenPrototypeDescription$ArgumentInfoCollection):185:187 -> 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.RewrittenPrototypeDescription$ArgumentInfoCollection):186:186 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLens -> com.android.tools.r8.internal.ms1:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLens -> com.android.tools.r8.internal.es1:
     java.util.Map removedArguments -> n
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,java.util.Map):59:60 -> <init>
     1:3:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):66:66 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> com.android.tools.r8.internal.ns1:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> com.android.tools.r8.internal.fs1:
     com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> c
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> a
     java.util.Set usedSignatures -> b
@@ -88055,7 +88153,7 @@ com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> com.
     27:27:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):145 -> a
     28:28:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):148:148 -> a
     29:29:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):147:147 -> a
-com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.As1:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.ts1:
     1:21:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_throwClassCastExceptionIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):44:64 -> a
     1:21:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getThrowClassCastExceptionIfNotNullCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):82 -> a
     1:21:com.android.tools.r8.graph.Code lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$2(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):74 -> a
@@ -88117,10 +88215,10 @@ com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations -> com.andro
     58:81:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):159:182 -> d
     58:81:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getToStringIfNotNullCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):54 -> d
     58:81:com.android.tools.r8.graph.Code lambda$synthesizeToStringIfNotNullMethod$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):46 -> d
-com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$1 -> com.android.tools.r8.internal.xs1:
-com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer -> com.android.tools.r8.internal.ys1:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$1 -> com.android.tools.r8.internal.qs1:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer -> com.android.tools.r8.internal.rs1:
     com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
-com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations -> com.android.tools.r8.internal.zs1:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations -> com.android.tools.r8.internal.ss1:
     com.android.tools.r8.graph.ProgramMethod method -> a
     boolean optimized -> b
     boolean $assertionsDisabled -> c
@@ -88130,7 +88228,7 @@ com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMetho
     1:2:com.android.tools.r8.graph.ProgramMethod getMethod():176:177 -> a
     3:4:void optimize(com.android.tools.r8.ir.conversion.MethodProcessor):185:186 -> a
     1:1:com.android.tools.r8.graph.ProgramMethod uncheckedGetMethod():181:181 -> b
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.internal.DG0:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.internal.GG0:
     java.util.concurrent.ConcurrentHashMap knownClasses -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():40:40 -> <clinit>
@@ -88153,7 +88251,7 @@ com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.
     139:156:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):284:301 -> a
     139:156:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):269 -> a
     139:156:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160 -> a
-    157:157:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():482:482 -> a
+    157:157:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():483:483 -> a
     157:157:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):304 -> a
     157:157:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):269 -> a
     157:157:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160 -> a
@@ -88172,12 +88270,12 @@ com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.
     165:165:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160 -> a
     166:167:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):270:271 -> a
     166:167:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.internal.CG0:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.internal.FG0:
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus ELIGIBLE -> a
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus NOT_ELIGIBLE -> b
     1:2:void <clinit>():43:44 -> <clinit>
     1:1:void <init>(java.lang.String,int):42:42 -> <init>
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis -> com.android.tools.r8.internal.EG0:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis -> com.android.tools.r8.internal.HG0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.inliner.InliningIRProvider inliningIRProvider -> b
     boolean $assertionsDisabled -> e
@@ -88201,7 +88299,7 @@ com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis -> com.an
     44:44:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):78 -> a
     45:55:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):79:89 -> a
     56:57:boolean exceedsInstructionBudgetAfterIncrement(int):95:96 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet -> com.android.tools.r8.internal.HG0:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet -> com.android.tools.r8.internal.KG0:
     java.util.Map deferredAliasValidityChecks -> c
     java.util.Set receiverAliases -> a
     java.util.Set illegalReceiverAliases -> b
@@ -88225,7 +88323,7 @@ com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet -> com.and
     1:1:boolean com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet.isDefiniteReceiverAlias(com.android.tools.r8.ir.code.Value):78:78 -> d
     1:1:boolean isReceiverAlias(com.android.tools.r8.ir.code.Value):74 -> d
     1:1:java.util.List lambda$addDeferredAliasValidityCheck$0(com.android.tools.r8.ir.code.Value):68:68 -> e
-com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.internal.iP0:
+com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.internal.lP0:
     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
@@ -88245,7 +88343,7 @@ com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.to
     80:83:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):162:165 -> a
     1:3:com.android.tools.r8.ir.code.Value getValueForFieldRead(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):63:65 -> b
     4:16:com.android.tools.r8.ir.code.Value getOrCreateOutValue(com.android.tools.r8.ir.code.BasicBlock):69:81 -> b
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.internal.ET0:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.internal.HT0:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.ProgramMethod method -> f
     com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet receivers -> o
@@ -88274,7 +88372,7 @@ com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.an
     13:13:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
     13:13:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):255 -> a
     14:18:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):256:260 -> a
-    19:19:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> a
+    19:19:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> a
     19:19:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):261 -> a
     20:20:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):264:264 -> a
     21:21:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
@@ -88286,7 +88384,7 @@ com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.an
     34:34:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
     34:34:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):273 -> a
     35:42:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):277:284 -> a
-    43:43:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> a
+    43:43:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> a
     43:43:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):285 -> a
     44:57:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):291:304 -> a
     58:58:boolean com.android.tools.r8.graph.Definition.isLibraryMethod():0:0 -> a
@@ -88373,10 +88471,19 @@ com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.an
     423:423:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):764 -> a
     423:423:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):676 -> a
     423:423:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
-    424:441:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceFieldReadFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set):793:810 -> a
-    424:441:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):764 -> a
-    424:441:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):676 -> a
-    424:441:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
+    424:439:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceFieldReadFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set):793:808 -> a
+    424:439:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):764 -> a
+    424:439:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):676 -> a
+    424:439:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
+    440:440:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
+    440:440:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceFieldReadFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set):809 -> a
+    440:440:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):764 -> a
+    440:440:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):676 -> a
+    440:440:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
+    441:441:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceFieldReadFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set):810:810 -> a
+    441:441:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):764 -> a
+    441:441:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):676 -> a
+    441:441:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
     442:442:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceFieldReadFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set):805:805 -> a
     442:442:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set):764 -> a
     442:442:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode):676 -> a
@@ -88462,7 +88569,7 @@ com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.an
     771:772:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1238:1239 -> a
     1:1:com.android.tools.r8.graph.DexProgramClass getEligibleClass():128:128 -> b
     2:2:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):814:814 -> b
-    3:3:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():478:478 -> b
+    3:3:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():479:479 -> b
     3:3:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):815 -> b
     4:9:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):815:820 -> b
     10:10:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):816:816 -> b
@@ -88489,7 +88596,7 @@ com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.an
     55:56:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():195:196 -> f
     57:57:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():184:184 -> f
     1:1:void rebindIndirectEligibleInstanceUsersFromPhis():533:533 -> g
-    2:3:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):33:34 -> g
+    2:3:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):38:39 -> g
     2:3:void rebindIndirectEligibleInstanceUsersFromPhis():533 -> g
     4:27:void rebindIndirectEligibleInstanceUsersFromPhis():534:557 -> g
     28:28:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):222:222 -> g
@@ -88498,14 +88605,14 @@ com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.an
     48:48:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> g
     48:48:void rebindIndirectEligibleInstanceUsersFromPhis():577 -> g
     49:55:void rebindIndirectEligibleInstanceUsersFromPhis():577:583 -> g
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.internal.DT0:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.internal.GT0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():1242:1242 -> <clinit>
     1:2:void <init>():1244:1245 -> <init>
 com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext -> com.android.tools.r8.internal.F1:
     1:1:void <init>():14:14 -> <init>
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext getDefaultContext():17:17 -> a
-com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsage -> com.android.tools.r8.internal.nC0:
+com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsage -> com.android.tools.r8.internal.qC0:
     com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsage BOTTOM -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -88527,7 +88634,7 @@ com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsage -> c
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock():69 -> j
     2:2:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock():69:69 -> j
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsage getInstance():17:17 -> l
-com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsagePerContext -> com.android.tools.r8.internal.oC0:
+com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsagePerContext -> com.android.tools.r8.internal.rC0:
     com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsagePerContext INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -88536,7 +88643,7 @@ com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsagePerCo
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage get(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext):27 -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext externalize() -> b
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsagePerContext getInstance():17:17 -> c
-com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages -> com.android.tools.r8.internal.pC0:
+com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages -> com.android.tools.r8.internal.sC0:
     com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -88547,7 +88654,7 @@ com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages ->
     1:1:boolean equals(java.lang.Object):43:43 -> equals
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages getInstance():16:16 -> g
     1:1:int hashCode():48:48 -> hashCode
-com.android.tools.r8.ir.optimize.classinliner.analysis.ClassInlinerMethodConstraintAnalysis -> com.android.tools.r8.internal.GG0:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ClassInlinerMethodConstraintAnalysis -> com.android.tools.r8.internal.JG0:
     1:7:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):20:26 -> a
     8:8:com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages.bottom():60:60 -> a
     8:8:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):28 -> a
@@ -88559,12 +88666,12 @@ com.android.tools.r8.ir.optimize.classinliner.analysis.ClassInlinerMethodConstra
     19:19:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):38 -> a
     20:22:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):39:41 -> a
     23:23:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):22:22 -> a
-com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext -> com.android.tools.r8.internal.mK0:
+com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext -> com.android.tools.r8.internal.pK0:
     com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext INSTANCE -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():11:11 -> <init>
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext getInstance():14:14 -> b
-com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage -> com.android.tools.r8.internal.uX0:
+com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage -> com.android.tools.r8.internal.xX0:
     boolean isParameterUsedAsLock -> e
     boolean $assertionsDisabled -> f
     java.util.Set fieldsReadFromParameter -> a
@@ -88598,7 +88705,7 @@ com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameter
     1:4:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterReturned():24 -> i
     1:4:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage.setParameterUsedAsLock():159:162 -> j
     1:4:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock():24 -> j
-com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder -> com.android.tools.r8.internal.tX0:
+com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder -> com.android.tools.r8.internal.wX0:
     boolean isParameterUsedAsLock -> e
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder methodCallsWithParameterAsReceiverBuilder -> b
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder fieldsReadFromParameterBuilder -> a
@@ -88617,7 +88724,7 @@ com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameter
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder joinIsReceiverUsedAsLock(boolean):254:254 -> c
     2:2:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder setParameterReturned():264:264 -> c
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder setParameterUsedAsLock():269:269 -> d
-com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsage -> com.android.tools.r8.internal.oa1:
+com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsage -> com.android.tools.r8.internal.ra1:
     boolean isParameterUsedAsLock -> e
     boolean $assertionsDisabled -> f
     java.util.Set fieldsReadFromParameter -> a
@@ -88641,7 +88748,7 @@ com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsage ->
     1:1:com.android.tools.r8.com.google.common.collect.Multiset getMethodCallsWithParameterAsReceiver():72:72 -> m
     1:1:boolean isParameterMutated():77:77 -> n
     1:1:boolean isParameterUsedAsLock():87:87 -> o
-com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext -> com.android.tools.r8.internal.pa1:
+com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext -> com.android.tools.r8.internal.sa1:
     java.util.Map backing -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():13:13 -> <clinit>
@@ -88720,7 +88827,7 @@ com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePer
     4:4:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext createInitial():28:28 -> c
     1:6:boolean equals(java.lang.Object):119:124 -> equals
     1:1:int hashCode():129:129 -> hashCode
-com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages -> com.android.tools.r8.internal.qa1:
+com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages -> com.android.tools.r8.internal.ta1:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap backing -> a
     com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration aliasedValueConfiguration -> b
     boolean $assertionsDisabled -> c
@@ -88796,7 +88903,7 @@ com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages -
     10:10:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages externalize():113 -> e
     1:5:boolean equals(java.lang.Object):227:231 -> equals
     1:1:int hashCode():236:236 -> hashCode
-com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage -> com.android.tools.r8.internal.ie1:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage -> com.android.tools.r8.internal.le1:
     1:1:void <init>():10:10 -> <init>
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addFieldReadFromParameter(com.android.tools.r8.graph.DexField) -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addMethodCallWithParameterAsReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver) -> a
@@ -88811,13 +88918,13 @@ com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage -> com.and
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterReturned() -> i
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock() -> j
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage top():88:88 -> k
-com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext -> com.android.tools.r8.internal.je1:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext -> com.android.tools.r8.internal.me1:
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext asKnown() -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage get(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext) -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext rebuild(java.util.function.BiFunction) -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext externalize() -> b
-com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages -> com.android.tools.r8.internal.ke1:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages -> com.android.tools.r8.internal.ne1:
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState() -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext get(int) -> a
@@ -88842,7 +88949,7 @@ com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages -> com.an
     com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages asNonEmpty() -> d
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages externalize() -> e
     boolean isTop() -> f
-com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction -> com.android.tools.r8.internal.br1:
+com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction -> com.android.tools.r8.internal.Tq1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.util.Set instructionsOfInterest -> g
     com.android.tools.r8.graph.AppView appView -> a
@@ -88973,7 +89080,7 @@ com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction -> com.a
     232:232:boolean isMaybeEligibleForClassInlining(com.android.tools.r8.ir.analysis.type.TypeElement):363 -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$analyzeMonitor$5(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):333:333 -> b
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$analyzeReturn$6(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):338:338 -> c
-com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage -> com.android.tools.r8.internal.as1:
+com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage -> com.android.tools.r8.internal.Sr1:
     com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage TOP -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -88985,7 +89092,7 @@ com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage ->
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterReturned() -> i
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock() -> j
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage getInstance():17:17 -> l
-com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsagePerContext -> com.android.tools.r8.internal.bs1:
+com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsagePerContext -> com.android.tools.r8.internal.Tr1:
     com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsagePerContext INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -88994,7 +89101,7 @@ com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsagePerC
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage get(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext):27 -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext externalize() -> b
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsagePerContext getInstance():17:17 -> c
-com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsages -> com.android.tools.r8.internal.cs1:
+com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsages -> com.android.tools.r8.internal.Ur1:
     com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsages INSTANCE -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():11:11 -> <init>
@@ -89023,14 +89130,14 @@ com.android.tools.r8.ir.optimize.classinliner.constraint.AlwaysTrueClassInlinerM
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage getParameterUsage(int):31:31 -> a
     com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint fixupAfterRemovingThisParameter() -> b
     1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.AlwaysTrueClassInlinerMethodConstraint getInstance():21:21 -> d
-com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint -> com.android.tools.r8.internal.FG0:
+com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint -> com.android.tools.r8.internal.IG0:
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage getParameterUsage(int) -> a
     boolean isEligibleForNewInstanceClassInlining(com.android.tools.r8.graph.ProgramMethod,int) -> a
     boolean isEligibleForStaticGetClassInlining(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.analysis.value.ObjectState,com.android.tools.r8.graph.ProgramMethod) -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.AlwaysFalseClassInlinerMethodConstraint alwaysFalse():28:28 -> a
     com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint fixupAfterRemovingThisParameter() -> b
     1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.AlwaysTrueClassInlinerMethodConstraint alwaysTrue():32:32 -> c
-com.android.tools.r8.ir.optimize.classinliner.constraint.ConditionalClassInlinerMethodConstraint -> com.android.tools.r8.internal.nJ0:
+com.android.tools.r8.ir.optimize.classinliner.constraint.ConditionalClassInlinerMethodConstraint -> com.android.tools.r8.internal.qJ0:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages usages -> a
     1:1:void <clinit>():25:25 -> <clinit>
@@ -89043,7 +89150,7 @@ com.android.tools.r8.ir.optimize.classinliner.constraint.ConditionalClassInliner
     2:2:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages.isBottom():0:0 -> b
     2:2:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint fixupAfterRemovingThisParameter():36 -> b
     3:12:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint fixupAfterRemovingThisParameter():39:48 -> b
-com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.tools.r8.internal.Pp1:
+com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.tools.r8.internal.Hp1:
     com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():15:17 -> <clinit>
@@ -89052,7 +89159,7 @@ com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.t
     2:15:boolean switchCaseIsAlwaysHit(com.android.tools.r8.ir.code.Switch,int):26:39 -> a
     16:32:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.ir.analysis.value.AbstractValue,int):44:60 -> a
     33:44:boolean switchFallthroughIsNeverHit(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.ir.analysis.value.AbstractValue):64:75 -> a
-com.android.tools.r8.ir.optimize.enums.EnumDataMap -> com.android.tools.r8.internal.yN0:
+com.android.tools.r8.ir.optimize.enums.EnumDataMap -> com.android.tools.r8.internal.BN0:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -89077,7 +89184,7 @@ com.android.tools.r8.ir.optimize.enums.EnumDataMap -> com.android.tools.r8.inter
     4:4:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.DexField):131:131 -> c
     4:4:boolean matchesValuesField(com.android.tools.r8.graph.DexField):82 -> c
     1:1:boolean isEmpty():36:36 -> d
-com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData -> com.android.tools.r8.internal.xN0:
+com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData -> com.android.tools.r8.internal.AN0:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.com.google.common.collect.ImmutableMap unboxedValues -> b
     int valuesSize -> d
@@ -89090,35 +89197,35 @@ com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData -> com.android.tools
     4:4:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasValues():135:135 -> a
     4:4:int getValuesSize():139 -> a
     5:6:int getValuesSize():139:140 -> a
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData -> com.android.tools.r8.internal.DN0:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData -> com.android.tools.r8.internal.GN0:
     1:1:void <init>():24:24 -> <init>
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData asEnumFieldKnownData() -> a
     boolean isUnknown() -> b
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData -> com.android.tools.r8.internal.zN0:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData -> com.android.tools.r8.internal.CN0:
     1:1:void <init>():52:52 -> <init>
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData asEnumFieldKnownData() -> a
     boolean isUnknown() -> b
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData asEnumFieldMappingData() -> c
     boolean isMapping() -> d
     boolean isOrdinal() -> e
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData -> com.android.tools.r8.internal.AN0:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData -> com.android.tools.r8.internal.DN0:
     com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap mapping -> a
     1:2:void <init>(com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap):88:89 -> <init>
     1:1:void forEach(java.util.function.BiConsumer):112:112 -> a
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData asEnumFieldMappingData() -> c
     boolean isMapping() -> d
     boolean isOrdinal() -> e
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldOrdinalData -> com.android.tools.r8.internal.BN0:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldOrdinalData -> com.android.tools.r8.internal.EN0:
     1:1:void <init>():73:73 -> <init>
     boolean isMapping() -> d
     boolean isOrdinal() -> e
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData -> com.android.tools.r8.internal.CN0:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData -> com.android.tools.r8.internal.FN0:
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData INSTANCE -> a
     1:1:void <clinit>():38:38 -> <clinit>
     1:1:void <init>():44:44 -> <init>
     boolean isUnknown() -> b
     1:1:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData getInstance():41:41 -> c
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer -> com.android.tools.r8.internal.HN0:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer -> com.android.tools.r8.internal.KN0:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection enumUnboxingCandidatesInfo -> c
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter enumUnboxerRewriter -> i
@@ -89126,445 +89233,460 @@ com.android.tools.r8.ir.optimize.enums.EnumUnboxer -> com.android.tools.r8.inter
     com.android.tools.r8.utils.collections.ProgramMethodMap checkNotNullMethods -> g
     java.util.Set candidatesToRemoveInWave -> d
     boolean $assertionsDisabled -> j
-    com.android.tools.r8.utils.collections.ProgramMethodSet methodsDependingOnLibraryModelisation -> f
-    com.android.tools.r8.graph.DexEncodedField ordinalField -> h
+    com.android.tools.r8.graph.DexClassAndField ordinalField -> h
     java.util.Map staticFieldValuesMap -> e
-    1:1:void <clinit>():132:132 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):156:156 -> <init>
-    2:37:void <init>(com.android.tools.r8.graph.AppView):139:174 -> <init>
+    com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder methodsDependingOnLibraryModelisation -> f
+    1:1:void <clinit>():134:134 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):160:160 -> <init>
+    2:33:void <init>(com.android.tools.r8.graph.AppView):141:172 -> <init>
     1:1:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues.isEnumStaticFieldValues():0:0 -> a
-    1:1:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):853 -> a
-    2:5:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):856:859 -> a
-    boolean reportFailure(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.enums.eligibility.Reason) -> a
-    6:6:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):132:132 -> a
-    7:7:boolean markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.eligibility.Reason,com.android.tools.r8.graph.DexProgramClass):196:196 -> a
-    8:8:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1527:1527 -> a
-    8:8:boolean markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.eligibility.Reason,com.android.tools.r8.graph.DexProgramClass):197 -> a
-    9:9:boolean markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.eligibility.Reason,com.android.tools.r8.graph.DexProgramClass):199:199 -> a
-    10:17:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):210:217 -> a
-    18:25:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):224:231 -> a
-    26:62:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):235:271 -> a
-    63:70:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,com.android.tools.r8.graph.ProgramMethod):365:372 -> a
-    63:70:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):271 -> a
-    71:81:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):268:278 -> a
-    82:85:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.Set,com.android.tools.r8.graph.ProgramMethod):351:354 -> a
-    82:85:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):277 -> a
-    86:86:com.android.tools.r8.graph.FieldResolutionResult com.android.tools.r8.graph.AppInfo.resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):251:251 -> a
-    86:86:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.Set,com.android.tools.r8.graph.ProgramMethod):354 -> a
-    86:86:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):277 -> a
-    87:90:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.Set,com.android.tools.r8.graph.ProgramMethod):355:358 -> a
-    87:90:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):277 -> a
-    91:91:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):262:262 -> a
-    92:105:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):424:437 -> a
-    92:105:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):262 -> a
-    106:106:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):448:448 -> a
-    106:106:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):438 -> a
-    106:106:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):262 -> a
-    107:107:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    107:107:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):448 -> a
-    107:107:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):438 -> a
-    107:107:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):262 -> a
-    108:119:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):449:460 -> a
-    108:119:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):438 -> a
-    108:119:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):262 -> a
-    120:120:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.addRequiredNameData(com.android.tools.r8.graph.DexProgramClass):491:491 -> a
-    120:120:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):463 -> a
-    120:120:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):438 -> a
-    120:120:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):262 -> a
-    121:121:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.markMethodDependsOnLibraryModelisation(com.android.tools.r8.graph.ProgramMethod):206:206 -> a
-    121:121:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):464 -> a
-    121:121:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):438 -> a
-    121:121:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):262 -> a
-    122:122:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):467:467 -> a
-    122:122:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):438 -> a
-    122:122:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):262 -> a
-    123:123:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.markMethodDependsOnLibraryModelisation(com.android.tools.r8.graph.ProgramMethod):206:206 -> a
-    123:123:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):469 -> a
-    123:123:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):438 -> a
-    123:123:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):262 -> a
-    124:130:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):474:480 -> a
-    124:130:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):438 -> a
-    124:130:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):262 -> a
-    131:131:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isUnboxableNameMethod(com.android.tools.r8.graph.DexMethod):496:496 -> a
-    131:131:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):482 -> a
-    131:131:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):438 -> a
-    131:131:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):262 -> a
-    132:136:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):439:443 -> a
-    132:136:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):262 -> a
-    137:137:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):265:265 -> a
-    138:147:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):387:396 -> a
-    138:147:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):265 -> a
-    148:150:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):408:410 -> a
-    148:150:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):400 -> a
-    148:150:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):265 -> a
-    151:151:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):409:409 -> a
-    151:151:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):400 -> a
-    151:151:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):265 -> a
-    152:155:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):401:404 -> a
-    152:155:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):265 -> a
-    156:175:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):283:302 -> a
-    176:183:void analyzeInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,java.util.Set):307:314 -> a
-    184:184:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexCallSite.getMethodProto():110:110 -> a
-    184:184:void analyzeInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,java.util.Set):314 -> a
-    185:187:void analyzeInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,java.util.Set):314:316 -> a
-    188:188:java.util.List com.android.tools.r8.graph.DexCallSite.getBootstrapArgs():106:106 -> a
-    188:188:void analyzeInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,java.util.Set):317 -> a
-    189:190:void analyzeInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,java.util.Set):317:318 -> a
-    191:193:void lambda$analyzeInvokeCustom$0(java.util.Set,com.android.tools.r8.graph.DexType):309:311 -> a
-    194:194:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):320:320 -> a
-    195:195:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
-    195:195:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):320 -> a
-    196:196:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):322:322 -> a
-    197:197:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():293:293 -> a
-    197:197:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):323 -> a
-    198:204:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):324:330 -> a
-    205:206:void com.android.tools.r8.graph.DexProto.forEachType(java.util.function.Consumer):78:79 -> a
-    205:206:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):330 -> a
-    207:207:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):333:333 -> a
-    208:208:boolean com.android.tools.r8.graph.DexMethodHandle.isFieldHandle():289:289 -> a
-    208:208:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):333 -> a
-    209:213:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):333:337 -> a
-    214:214:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> a
-    214:214:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):339 -> a
-    215:215:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):339:339 -> a
-    216:216:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodType():0:0 -> a
-    216:216:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):342 -> a
-    217:217:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):343:343 -> a
-    218:219:void com.android.tools.r8.graph.DexProto.forEachType(java.util.function.Consumer):78:79 -> a
-    218:219:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):344 -> a
-    220:243:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):502:525 -> a
-    244:245:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):532:533 -> a
-    246:278:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1083:1115 -> a
-    246:278:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):534 -> a
-    279:279:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1095:1095 -> a
-    279:279:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):534 -> a
-    280:282:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):408:410 -> a
-    280:282:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCastUser(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1182 -> a
-    280:282:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1095 -> a
-    280:282:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):534 -> a
-    283:283:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):409:409 -> a
-    283:283:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCastUser(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1182 -> a
-    283:283:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1095 -> a
-    283:283:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):534 -> a
-    284:286:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCastUser(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1183:1185 -> a
-    284:286:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1095 -> a
-    284:286:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):534 -> a
-    287:287:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1086:1086 -> a
-    287:287:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):534 -> a
-    288:288:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeAssumeUser(com.android.tools.r8.ir.code.Assume,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1125:1125 -> a
-    288:288:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1086 -> a
-    288:288:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):534 -> a
-    289:289:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1093:1093 -> a
-    289:289:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):534 -> a
-    290:305:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeArrayPutUser(com.android.tools.r8.ir.code.ArrayPut,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1158:1173 -> a
-    290:305:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1093 -> a
-    290:305:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):534 -> a
-    306:306:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1091:1091 -> a
-    306:306:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):534 -> a
-    307:307:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1090:1090 -> a
-    307:307:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):534 -> a
-    308:333:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1088:1113 -> a
-    308:333:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):534 -> a
-    334:334:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1111:1111 -> a
-    334:334:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):534 -> a
-    335:339:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeReturnUser(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1434:1438 -> a
-    335:339:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1111 -> a
-    335:339:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):534 -> a
-    340:340:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1103:1103 -> a
-    340:340:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):534 -> a
-    341:341:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1102:1102 -> a
-    341:341:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):534 -> a
-    342:342:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1100:1100 -> a
-    342:342:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):534 -> a
-    343:346:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInstanceGetUser(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1242:1245 -> a
-    343:346:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1099 -> a
-    343:346:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):534 -> a
-    347:347:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1097:1097 -> a
-    347:347:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):534 -> a
-    348:362:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeIfUser(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1219:1233 -> a
-    348:362:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1097 -> a
-    348:362:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):534 -> a
-    363:378:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):535:550 -> a
-    379:379:void unboxEnums(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):564:564 -> a
-    380:388:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.finishAnalysis():649:657 -> a
-    380:388:void unboxEnums(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):565 -> a
-    389:408:void unboxEnums(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):566:585 -> a
-    409:409:com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses$Builder com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses.builder(com.android.tools.r8.graph.AppView):60:60 -> a
-    409:409:void unboxEnums(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):586 -> a
-    410:429:void unboxEnums(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):587:606 -> a
-    430:430:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.updateOptimizationInfos(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.PrunedItems):621:621 -> a
-    430:430:void unboxEnums(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):606 -> a
-    431:431:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed.fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):74:74 -> a
-    431:431:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.updateOptimizationInfos(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.PrunedItems):621 -> a
-    431:431:void unboxEnums(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):606 -> a
-    432:432:void com.android.tools.r8.ir.optimize.info.OptimizationFeedback.fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):46:46 -> a
-    432:432:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed.fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):75 -> a
-    432:432:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.updateOptimizationInfos(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.PrunedItems):621 -> a
-    432:432:void unboxEnums(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):606 -> a
-    433:439:void unboxEnums(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):607:613 -> a
-    440:441:void updateKeepInfo(java.util.Set):644:645 -> a
-    442:442:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):498:498 -> a
-    442:442:void updateKeepInfo(java.util.Set):645 -> a
-    443:443:void lambda$updateKeepInfo$2(java.util.Set,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):645:645 -> a
-    444:458:com.android.tools.r8.ir.optimize.enums.EnumDataMap analyzeEnumInstances():662:676 -> a
-    459:476:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):680:697 -> a
-    459:476:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    477:477:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1527:1527 -> a
-    477:477:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):697 -> a
-    477:477:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    478:489:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):703:714 -> a
-    478:489:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    490:490:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1527:1527 -> a
-    490:490:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):713 -> a
-    490:490:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    491:496:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):717:722 -> a
-    491:496:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    497:497:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1527:1527 -> a
-    497:497:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):719 -> a
-    497:497:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    498:513:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):725:740 -> a
-    498:513:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    514:514:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1527:1527 -> a
-    514:514:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):739 -> a
-    514:514:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    515:515:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):743:743 -> a
-    515:515:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    516:516:boolean com.android.tools.r8.ir.analysis.value.ObjectState.isEnumValuesObjectState():0:0 -> a
-    516:516:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):743 -> a
-    516:516:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    517:519:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):743:745 -> a
-    517:519:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    520:539:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):744:763 -> a
-    520:539:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    540:541:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):788:789 -> a
-    540:541:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):772 -> a
-    540:541:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    542:545:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):809:812 -> a
-    542:545:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):791 -> a
-    542:545:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):772 -> a
-    542:545:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    546:546:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.builder():38:38 -> a
-    546:546:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):814 -> a
-    546:546:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):791 -> a
-    546:546:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):772 -> a
-    546:546:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    547:552:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):815:820 -> a
-    547:552:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):791 -> a
-    547:552:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):772 -> a
-    547:552:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    553:553:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1527:1527 -> a
-    553:553:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):819 -> a
-    553:553:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):791 -> a
-    553:553:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):772 -> a
-    553:553:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    554:554:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):821:821 -> a
-    554:554:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):791 -> a
-    554:554:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):772 -> a
-    554:554:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    555:555:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
-    555:555:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):823 -> a
-    555:555:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):791 -> a
-    555:555:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):772 -> a
-    555:555:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    556:559:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):823:826 -> a
-    556:559:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):791 -> a
-    556:559:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):772 -> a
-    556:559:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    560:560:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1527:1527 -> a
-    560:560:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):824 -> a
-    560:560:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):791 -> a
-    560:560:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):772 -> a
-    560:560:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    561:575:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):827:841 -> a
-    561:575:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):791 -> a
-    561:575:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):772 -> a
-    561:575:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    576:586:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):792:802 -> a
-    576:586:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):772 -> a
-    576:586:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    587:591:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):777:781 -> a
-    587:591:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):665 -> a
-    592:596:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):668:672 -> a
-    597:598:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.ObjectState):845:846 -> a
-    599:599:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
-    599:599:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.ObjectState):846 -> a
-    600:602:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.ObjectState):847:849 -> a
-    603:616:void lambda$analyzeInitializers$4(com.android.tools.r8.graph.DexProgramClass):1063:1076 -> a
-    617:622:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1196:1201 -> a
-    623:623:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):52:52 -> a
-    623:623:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1201 -> a
-    624:624:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
-    624:624:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):52 -> a
-    624:624:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1201 -> a
-    625:634:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1203:1212 -> a
-    635:662:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1255:1282 -> a
-    663:663:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isCheckNotNullClassification():0:0 -> a
-    663:663:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1282 -> a
-    664:666:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1284:1286 -> a
-    667:671:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1285:1289 -> a
-    672:681:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1288:1297 -> a
-    682:683:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getArgumentForParameter(int):186:187 -> a
-    682:683:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1298 -> a
-    684:694:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1299:1309 -> a
-    695:695:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    695:695:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1312 -> a
-    696:699:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1313:1316 -> a
-    700:700:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    700:700:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1316 -> a
-    701:701:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1316:1316 -> a
-    702:725:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1338:1361 -> a
-    702:725:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1319 -> a
-    726:726:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1351:1351 -> a
-    726:726:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1319 -> a
-    727:727:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.addRequiredNameData(com.android.tools.r8.graph.DexProgramClass):491:491 -> a
-    727:727:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1352 -> a
-    727:727:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1319 -> a
-    728:728:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1353:1353 -> a
-    728:728:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1319 -> a
-    729:750:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1343:1364 -> a
-    729:750:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1319 -> a
-    751:792:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1345:1386 -> a
-    751:792:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1319 -> a
-    793:800:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1384:1391 -> a
-    793:800:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1319 -> a
-    801:801:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.addRequiredNameData(com.android.tools.r8.graph.DexProgramClass):491:491 -> a
-    801:801:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1392 -> a
-    801:801:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1319 -> a
-    802:833:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1393:1424 -> a
-    802:833:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1319 -> a
-    834:839:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1401:1406 -> a
-    834:839:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1319 -> a
-    840:840:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.addRequiredNameData(com.android.tools.r8.graph.DexProgramClass):491:491 -> a
-    840:840:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1403 -> a
-    840:840:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1319 -> a
-    841:841:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1404:1404 -> a
-    841:841:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1319 -> a
-    842:842:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1322:1322 -> a
-    843:843:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.markMethodDependsOnLibraryModelisation(com.android.tools.r8.graph.ProgramMethod):206:206 -> a
-    843:843:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1323 -> a
-    844:847:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1544:1547 -> a
-    1:1:void analyzeInitializers():1061:1061 -> b
-    1:1:void unsetRewriter():1551:1551 -> c
-    1:4:void updateEnumUnboxingCandidatesInfo():183:186 -> d
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer$1 -> com.android.tools.r8.internal.GN0:
+    1:1:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):875 -> a
+    2:5:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):878:881 -> a
+    6:6:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):134:134 -> a
+    7:7:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getOrdinalField():180:180 -> a
+    7:7:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.ObjectState):867 -> a
+    8:9:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.ObjectState):867:868 -> a
+    10:10:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
+    10:10:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.ObjectState):868 -> a
+    11:13:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.ObjectState):869:871 -> a
+    14:14:boolean markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.eligibility.Reason,com.android.tools.r8.graph.DexProgramClass):197:197 -> a
+    15:15:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1549:1549 -> a
+    15:15:boolean markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.eligibility.Reason,com.android.tools.r8.graph.DexProgramClass):198 -> a
+    16:16:boolean markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.eligibility.Reason,com.android.tools.r8.graph.DexProgramClass):200:200 -> a
+    17:24:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):211:218 -> a
+    25:32:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):225:232 -> a
+    33:69:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):236:272 -> a
+    70:77:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,com.android.tools.r8.graph.ProgramMethod):366:373 -> a
+    70:77:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):272 -> a
+    78:88:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):269:279 -> a
+    89:92:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.Set,com.android.tools.r8.graph.ProgramMethod):352:355 -> a
+    89:92:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):278 -> a
+    93:93:com.android.tools.r8.graph.FieldResolutionResult com.android.tools.r8.graph.AppInfo.resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):251:251 -> a
+    93:93:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.Set,com.android.tools.r8.graph.ProgramMethod):355 -> a
+    93:93:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):278 -> a
+    94:97:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.Set,com.android.tools.r8.graph.ProgramMethod):356:359 -> a
+    94:97:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):278 -> a
+    98:98:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):263:263 -> a
+    99:112:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):425:438 -> a
+    99:112:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):263 -> a
+    113:113:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):449:449 -> a
+    113:113:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):439 -> a
+    113:113:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):263 -> a
+    114:114:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    114:114:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):449 -> a
+    114:114:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):439 -> a
+    114:114:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):263 -> a
+    115:126:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):450:461 -> a
+    115:126:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):439 -> a
+    115:126:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):263 -> a
+    127:127:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.addRequiredNameData(com.android.tools.r8.graph.DexProgramClass):492:492 -> a
+    127:127:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):464 -> a
+    127:127:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):439 -> a
+    127:127:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):263 -> a
+    128:128:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.markMethodDependsOnLibraryModelisation(com.android.tools.r8.graph.ProgramMethod):207:207 -> a
+    128:128:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):465 -> a
+    128:128:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):439 -> a
+    128:128:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):263 -> a
+    129:129:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):468:468 -> a
+    129:129:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):439 -> a
+    129:129:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):263 -> a
+    130:130:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.markMethodDependsOnLibraryModelisation(com.android.tools.r8.graph.ProgramMethod):207:207 -> a
+    130:130:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):470 -> a
+    130:130:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):439 -> a
+    130:130:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):263 -> a
+    131:137:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):475:481 -> a
+    131:137:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):439 -> a
+    131:137:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):263 -> a
+    138:138:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isUnboxableNameMethod(com.android.tools.r8.graph.DexMethod):497:497 -> a
+    138:138:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isLegitimateConstClassUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):483 -> a
+    138:138:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):439 -> a
+    138:138:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):263 -> a
+    139:143:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):440:444 -> a
+    139:143:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):263 -> a
+    144:144:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):266:266 -> a
+    145:154:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):388:397 -> a
+    145:154:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):266 -> a
+    155:157:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):409:411 -> a
+    155:157:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):401 -> a
+    155:157:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):266 -> a
+    158:158:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):410:410 -> a
+    158:158:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):401 -> a
+    158:158:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):266 -> a
+    159:162:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):402:405 -> a
+    159:162:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):266 -> a
+    163:182:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):284:303 -> a
+    183:190:void analyzeInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,java.util.Set):308:315 -> a
+    191:191:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexCallSite.getMethodProto():110:110 -> a
+    191:191:void analyzeInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,java.util.Set):315 -> a
+    192:194:void analyzeInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,java.util.Set):315:317 -> a
+    195:195:java.util.List com.android.tools.r8.graph.DexCallSite.getBootstrapArgs():106:106 -> a
+    195:195:void analyzeInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,java.util.Set):318 -> a
+    196:197:void analyzeInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,java.util.Set):318:319 -> a
+    198:200:void lambda$analyzeInvokeCustom$0(java.util.Set,com.android.tools.r8.graph.DexType):310:312 -> a
+    201:201:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):321:321 -> a
+    202:202:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
+    202:202:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):321 -> a
+    203:203:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):323:323 -> a
+    204:204:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():293:293 -> a
+    204:204:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):324 -> a
+    205:211:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):325:331 -> a
+    212:213:void com.android.tools.r8.graph.DexProto.forEachType(java.util.function.Consumer):78:79 -> a
+    212:213:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):331 -> a
+    214:214:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):334:334 -> a
+    215:215:boolean com.android.tools.r8.graph.DexMethodHandle.isFieldHandle():289:289 -> a
+    215:215:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):334 -> a
+    216:220:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):334:338 -> a
+    221:221:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> a
+    221:221:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):340 -> a
+    222:222:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):340:340 -> a
+    223:223:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodType():0:0 -> a
+    223:223:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):343 -> a
+    224:224:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):344:344 -> a
+    225:226:void com.android.tools.r8.graph.DexProto.forEachType(java.util.function.Consumer):78:79 -> a
+    225:226:void lambda$analyzeInvokeCustom$1(java.util.function.Consumer,com.android.tools.r8.graph.DexValue):345 -> a
+    227:250:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):503:526 -> a
+    251:252:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):533:534 -> a
+    253:285:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1105:1137 -> a
+    253:285:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):535 -> a
+    286:286:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1117:1117 -> a
+    286:286:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):535 -> a
+    287:289:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):409:411 -> a
+    287:289:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCastUser(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1204 -> a
+    287:289:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1117 -> a
+    287:289:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):535 -> a
+    290:290:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):410:410 -> a
+    290:290:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCastUser(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1204 -> a
+    290:290:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1117 -> a
+    290:290:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):535 -> a
+    291:293:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCastUser(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1205:1207 -> a
+    291:293:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1117 -> a
+    291:293:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):535 -> a
+    294:294:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1108:1108 -> a
+    294:294:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):535 -> a
+    295:295:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeAssumeUser(com.android.tools.r8.ir.code.Assume,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1147:1147 -> a
+    295:295:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1108 -> a
+    295:295:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):535 -> a
+    296:296:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1115:1115 -> a
+    296:296:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):535 -> a
+    297:312:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeArrayPutUser(com.android.tools.r8.ir.code.ArrayPut,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1180:1195 -> a
+    297:312:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1115 -> a
+    297:312:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):535 -> a
+    313:313:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1113:1113 -> a
+    313:313:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):535 -> a
+    314:314:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1112:1112 -> a
+    314:314:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):535 -> a
+    315:340:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1110:1135 -> a
+    315:340:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):535 -> a
+    341:341:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1133:1133 -> a
+    341:341:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):535 -> a
+    342:346:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeReturnUser(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1456:1460 -> a
+    342:346:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1133 -> a
+    342:346:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):535 -> a
+    347:347:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1125:1125 -> a
+    347:347:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):535 -> a
+    348:348:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1124:1124 -> a
+    348:348:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):535 -> a
+    349:349:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1122:1122 -> a
+    349:349:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):535 -> a
+    350:353:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeInstanceGetUser(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1264:1267 -> a
+    350:353:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1121 -> a
+    350:353:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):535 -> a
+    354:354:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1119:1119 -> a
+    354:354:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):535 -> a
+    355:369:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeIfUser(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1241:1255 -> a
+    355:369:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1119 -> a
+    355:369:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):535 -> a
+    370:385:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):536:551 -> a
+    386:391:void initializeEnumUnboxingCandidates(com.android.tools.r8.graph.GraphLens):560:565 -> a
+    392:392:void unboxEnums(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):575:575 -> a
+    393:401:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.finishAnalysis():671:679 -> a
+    393:401:void unboxEnums(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):576 -> a
+    402:422:void unboxEnums(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):577:597 -> a
+    423:423:com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses$Builder com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses.builder(com.android.tools.r8.graph.AppView):60:60 -> a
+    423:423:void unboxEnums(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):598 -> a
+    424:445:void unboxEnums(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):599:620 -> a
+    446:446:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.rewrittenWithLens(com.android.tools.r8.graph.AppView):112:112 -> a
+    446:446:void unboxEnums(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):620 -> a
+    447:452:void unboxEnums(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):621:626 -> a
+    453:453:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.updateOptimizationInfos(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.PrunedItems):643:643 -> a
+    453:453:void unboxEnums(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):626 -> a
+    454:454:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed.fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):74:74 -> a
+    454:454:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.updateOptimizationInfos(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.PrunedItems):643 -> a
+    454:454:void unboxEnums(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):626 -> a
+    455:455:void com.android.tools.r8.ir.optimize.info.OptimizationFeedback.fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):46:46 -> a
+    455:455:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed.fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):75 -> a
+    455:455:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.updateOptimizationInfos(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.PrunedItems):643 -> a
+    455:455:void unboxEnums(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):626 -> a
+    456:459:void unboxEnums(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):628:631 -> a
+    460:461:void updateKeepInfo(java.util.Set):666:667 -> a
+    462:462:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):498:498 -> a
+    462:462:void updateKeepInfo(java.util.Set):667 -> a
+    463:463:void lambda$updateKeepInfo$2(java.util.Set,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):667:667 -> a
+    464:478:com.android.tools.r8.ir.optimize.enums.EnumDataMap analyzeEnumInstances():684:698 -> a
+    479:494:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):702:717 -> a
+    479:494:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    495:495:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1549:1549 -> a
+    495:495:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):719 -> a
+    495:495:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    496:507:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):725:736 -> a
+    496:507:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    508:508:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1549:1549 -> a
+    508:508:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):735 -> a
+    508:508:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    509:514:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):739:744 -> a
+    509:514:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    515:515:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1549:1549 -> a
+    515:515:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):741 -> a
+    515:515:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    516:531:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):747:762 -> a
+    516:531:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    532:532:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1549:1549 -> a
+    532:532:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):761 -> a
+    532:532:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    533:533:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):765:765 -> a
+    533:533:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    534:534:boolean com.android.tools.r8.ir.analysis.value.ObjectState.isEnumValuesObjectState():0:0 -> a
+    534:534:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):765 -> a
+    534:534:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    535:537:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):765:767 -> a
+    535:537:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    538:557:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):766:785 -> a
+    538:557:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    558:559:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):810:811 -> a
+    558:559:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):794 -> a
+    558:559:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    560:563:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):831:834 -> a
+    560:563:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):813 -> a
+    560:563:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):794 -> a
+    560:563:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    564:564:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.builder():38:38 -> a
+    564:564:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):836 -> a
+    564:564:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):813 -> a
+    564:564:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):794 -> a
+    564:564:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    565:570:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):837:842 -> a
+    565:570:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):813 -> a
+    565:570:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):794 -> a
+    565:570:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    571:571:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1549:1549 -> a
+    571:571:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):841 -> a
+    571:571:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):813 -> a
+    571:571:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):794 -> a
+    571:571:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    572:572:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):843:843 -> a
+    572:572:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):813 -> a
+    572:572:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):794 -> a
+    572:572:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    573:573:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
+    573:573:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):845 -> a
+    573:573:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):813 -> a
+    573:573:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):794 -> a
+    573:573:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    574:577:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):845:848 -> a
+    574:577:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):813 -> a
+    574:577:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):794 -> a
+    574:577:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    578:578:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1549:1549 -> a
+    578:578:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):846 -> a
+    578:578:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):813 -> a
+    578:578:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):794 -> a
+    578:578:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    579:593:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):849:863 -> a
+    579:593:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):813 -> a
+    579:593:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):794 -> a
+    579:593:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    594:604:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeRequiredEnumInstanceFieldsData(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):814:824 -> a
+    594:604:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):794 -> a
+    594:604:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    605:609:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):799:803 -> a
+    605:609:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):687 -> a
+    610:614:void lambda$analyzeEnumInstances$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):690:694 -> a
+    615:628:void lambda$analyzeInitializers$4(com.android.tools.r8.graph.DexProgramClass):1085:1098 -> a
+    629:634:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1218:1223 -> a
+    635:635:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):52:52 -> a
+    635:635:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1223 -> a
+    636:636:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
+    636:636:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):52 -> a
+    636:636:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1223 -> a
+    637:646:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1225:1234 -> a
+    647:674:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1277:1304 -> a
+    675:675:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isCheckNotNullClassification():0:0 -> a
+    675:675:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1304 -> a
+    676:678:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1306:1308 -> a
+    679:683:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1307:1311 -> a
+    684:693:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1310:1319 -> a
+    694:695:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getArgumentForParameter(int):186:187 -> a
+    694:695:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1320 -> a
+    696:706:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1321:1331 -> a
+    707:707:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    707:707:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1334 -> a
+    708:711:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1335:1338 -> a
+    712:712:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    712:712:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1338 -> a
+    713:713:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1338:1338 -> a
+    714:737:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1360:1383 -> a
+    714:737:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1341 -> a
+    738:738:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1373:1373 -> a
+    738:738:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1341 -> a
+    739:739:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.addRequiredNameData(com.android.tools.r8.graph.DexProgramClass):492:492 -> a
+    739:739:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1374 -> a
+    739:739:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1341 -> a
+    740:740:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1375:1375 -> a
+    740:740:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1341 -> a
+    741:762:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1365:1386 -> a
+    741:762:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1341 -> a
+    763:804:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1367:1408 -> a
+    763:804:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1341 -> a
+    805:812:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1406:1413 -> a
+    805:812:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1341 -> a
+    813:813:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.addRequiredNameData(com.android.tools.r8.graph.DexProgramClass):492:492 -> a
+    813:813:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1414 -> a
+    813:813:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1341 -> a
+    814:845:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1415:1446 -> a
+    814:845:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1341 -> a
+    846:851:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1423:1428 -> a
+    846:851:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1341 -> a
+    852:852:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.addRequiredNameData(com.android.tools.r8.graph.DexProgramClass):492:492 -> a
+    852:852:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1425 -> a
+    852:852:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1341 -> a
+    853:853:com.android.tools.r8.ir.optimize.enums.eligibility.Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeLibraryInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1426:1426 -> a
+    853:853:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1341 -> a
+    854:854:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1344:1344 -> a
+    855:855:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.markMethodDependsOnLibraryModelisation(com.android.tools.r8.graph.ProgramMethod):207:207 -> a
+    855:855:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1345 -> a
+    856:859:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1566:1569 -> a
+    1:1:void analyzeInitializers():1083:1083 -> b
+    1:1:com.android.tools.r8.graph.DexClassAndField getOrdinalField():180:180 -> c
+    1:1:void unsetRewriter():1573:1573 -> d
+    1:4:void updateEnumUnboxingCandidatesInfo():184:187 -> e
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer$1 -> com.android.tools.r8.internal.JN0:
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer this$0 -> b
     com.android.tools.r8.graph.PrunedItems val$prunedItems -> a
-    1:1:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer,com.android.tools.r8.graph.PrunedItems):624:624 -> <init>
-    1:2:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):627:628 -> a
+    1:1:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer,com.android.tools.r8.graph.PrunedItems):646:646 -> <init>
+    1:2:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):649:650 -> a
     3:3:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo.fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):42:42 -> a
-    3:3:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):628 -> a
-    4:5:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):628:629 -> a
-    6:7:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):635:636 -> a
+    3:3:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):650 -> a
+    4:5:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):650:651 -> a
+    6:7:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):657:658 -> a
     8:8:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):161:161 -> a
-    8:8:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):636 -> a
-    9:11:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):636:638 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis -> com.android.tools.r8.internal.KN0:
+    8:8:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):658 -> a
+    9:11:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):658:660 -> a
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis -> com.android.tools.r8.internal.NN0:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection enumToUnboxCandidates -> d
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer enumUnboxer -> b
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():19:19 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumUnboxer):32:32 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumUnboxer):29:35 -> <init>
-    1:3:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():39:41 -> a
-    4:4:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():76:76 -> a
-    4:4:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():44 -> a
-    5:5:boolean com.android.tools.r8.graph.DexClass.isAnnotation():651:651 -> a
-    5:5:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():77 -> a
-    5:5:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():44 -> a
-    6:6:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():78:78 -> a
-    6:6:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():44 -> a
-    7:9:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):87:89 -> a
-    7:9:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():79 -> a
-    7:9:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():44 -> a
-    10:15:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):88:93 -> a
-    10:15:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():79 -> a
-    10:15:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():44 -> a
-    16:20:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():45:49 -> a
-    21:27:boolean isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):53:59 -> a
-    28:28:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1527:1527 -> a
-    28:28:boolean isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):59 -> a
-    29:30:boolean isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):66:67 -> a
-    31:31:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1527:1527 -> a
-    31:31:boolean isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):67 -> a
-    32:32:void lambda$removePinnedCandidates$0(com.android.tools.r8.graph.DexField):106:106 -> a
-    33:36:void lambda$removePinnedCandidates$1(com.android.tools.r8.graph.DexMethod):109:112 -> a
-    37:38:void removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):119:120 -> a
-    39:41:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removePinnedCandidate(com.android.tools.r8.graph.DexType):126:128 -> a
-    39:41:void removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):121 -> a
-    42:44:void removePinnedCandidate(com.android.tools.r8.graph.DexType):126:128 -> a
-    1:5:void removePinnedCandidates():103:107 -> b
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection -> com.android.tools.r8.internal.MN0:
+    1:1:void <clinit>():20:20 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumUnboxer):33:33 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumUnboxer):30:36 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):41:41 -> a
+    2:2:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
+    2:2:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):41 -> a
+    3:3:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):46:46 -> a
+    4:18:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):60:74 -> a
+    4:18:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):47 -> a
+    19:19:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1549:1549 -> a
+    19:19:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):74 -> a
+    19:19:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):47 -> a
+    20:20:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):66:66 -> a
+    20:20:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):47 -> a
+    21:21:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1549:1549 -> a
+    21:21:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):66 -> a
+    21:21:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):47 -> a
+    22:22:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):48:48 -> a
+    23:23:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():83:83 -> a
+    23:23:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):51 -> a
+    24:24:boolean com.android.tools.r8.graph.DexClass.isAnnotation():651:651 -> a
+    24:24:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():84 -> a
+    24:24:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):51 -> a
+    25:25:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():85:85 -> a
+    25:25:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):51 -> a
+    26:28:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):94:96 -> a
+    26:28:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():86 -> a
+    26:28:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):51 -> a
+    29:34:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):95:100 -> a
+    29:34:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():86 -> a
+    29:34:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):51 -> a
+    35:39:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):52:56 -> a
+    40:40:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):44:44 -> a
+    41:45:void removePinnedCandidates():110:114 -> a
+    46:46:void lambda$removePinnedCandidates$0(com.android.tools.r8.graph.DexField):113:113 -> a
+    47:50:void lambda$removePinnedCandidates$1(com.android.tools.r8.graph.DexMethod):116:119 -> a
+    51:52:void removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):126:127 -> a
+    53:55:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removePinnedCandidate(com.android.tools.r8.graph.DexType):133:135 -> a
+    53:55:void removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):128 -> a
+    56:58:void removePinnedCandidate(com.android.tools.r8.graph.DexType):133:135 -> a
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection -> com.android.tools.r8.internal.PN0:
     java.util.Map enumTypeToInfo -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():20:20 -> <clinit>
-    1:3:void <init>():20:22 -> <init>
-    1:2:void addCandidate(com.android.tools.r8.graph.DexProgramClass):25:26 -> a
-    3:7:com.android.tools.r8.graph.DexProgramClass getCandidateClassOrNull(com.android.tools.r8.graph.DexType):58:62 -> a
-    8:10:com.android.tools.r8.utils.collections.ProgramMethodSet allMethodDependencies():66:68 -> a
-    11:15:void addMethodDependency(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):77:81 -> a
-    16:20:void addRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):88:92 -> a
-    21:21:void forEachCandidate(java.util.function.Consumer):96:96 -> a
-    22:22:void lambda$forEachCandidate$0(java.util.function.Consumer,com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):96:96 -> a
-    23:25:void forEachCandidateAndRequiredInstanceFieldData(java.util.function.BiConsumer):101:103 -> a
-    26:26:void lambda$forEachCandidateAndRequiredInstanceFieldData$1(java.util.function.BiConsumer,com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):104:104 -> a
-    1:1:void removeCandidate(com.android.tools.r8.graph.DexProgramClass):30:30 -> b
-    2:2:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection.removeCandidate(com.android.tools.r8.graph.DexType):34:34 -> b
-    2:2:void removeCandidate(com.android.tools.r8.graph.DexProgramClass):30 -> b
-    3:3:boolean isCandidate(com.android.tools.r8.graph.DexType):38:38 -> b
-    4:8:com.android.tools.r8.com.google.common.collect.ImmutableSet candidateClasses():50:54 -> b
-    1:1:void removeCandidate(com.android.tools.r8.graph.DexType):34:34 -> c
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet candidates():46:46 -> c
-    1:1:void clear():108:108 -> d
-    1:1:boolean isEmpty():42:42 -> e
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo -> com.android.tools.r8.internal.LN0:
+    1:1:void <clinit>():25:25 -> <clinit>
+    1:3:void <init>():25:27 -> <init>
+    1:2:void addCandidate(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLens):33:34 -> a
+    3:3:void removeCandidate(com.android.tools.r8.graph.DexProgramClass):40:40 -> a
+    4:4:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection.removeCandidate(com.android.tools.r8.graph.DexType):44:44 -> a
+    4:4:void removeCandidate(com.android.tools.r8.graph.DexProgramClass):40 -> a
+    5:9:com.android.tools.r8.graph.DexProgramClass getCandidateClassOrNull(com.android.tools.r8.graph.DexType):68:72 -> a
+    10:15:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder allMethodDependencies():76:81 -> a
+    16:20:void addMethodDependency(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):90:94 -> a
+    21:25:void addRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):101:105 -> a
+    26:26:void forEachCandidate(java.util.function.Consumer):109:109 -> a
+    27:27:void lambda$forEachCandidate$0(java.util.function.Consumer,com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):109:109 -> a
+    28:30:void forEachCandidateAndRequiredInstanceFieldData(java.util.function.BiConsumer):114:116 -> a
+    31:31:void lambda$forEachCandidateAndRequiredInstanceFieldData$1(java.util.function.BiConsumer,com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):117:117 -> a
+    1:1:boolean isCandidate(com.android.tools.r8.graph.DexType):48:48 -> b
+    2:6:com.android.tools.r8.com.google.common.collect.ImmutableSet candidateClasses():60:64 -> b
+    1:1:void removeCandidate(com.android.tools.r8.graph.DexType):44:44 -> c
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet candidates():56:56 -> c
+    1:1:void clear():121:121 -> d
+    1:1:boolean isEmpty():52:52 -> e
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo -> com.android.tools.r8.internal.ON0:
     java.util.Set requiredInstanceFieldData -> c
-    com.android.tools.r8.utils.collections.ProgramMethodSet methodDependencies -> b
     com.android.tools.r8.graph.DexProgramClass enumClass -> a
+    com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder methodDependencies -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():111:111 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexProgramClass):117:117 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexProgramClass):114:119 -> <init>
-    1:1:com.android.tools.r8.graph.DexProgramClass access$000(com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):111:111 -> a
-    2:2:com.android.tools.r8.graph.DexProgramClass getEnumClass():123:123 -> a
-    3:3:void addMethodDependency(com.android.tools.r8.graph.ProgramMethod):127:127 -> a
-    4:4:void addRequiredInstanceFieldData(com.android.tools.r8.graph.DexField):131:131 -> a
-    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet access$100(com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):111:111 -> b
-    2:2:java.util.Set getRequiredInstanceFieldData():135:135 -> b
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods -> com.android.tools.r8.internal.QN0:
+    1:1:void <clinit>():124:124 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLens):133:133 -> <init>
+    2:12:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLens):128:138 -> <init>
+    1:1:com.android.tools.r8.graph.DexProgramClass access$000(com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):124:124 -> a
+    2:2:com.android.tools.r8.graph.DexProgramClass getEnumClass():143:143 -> a
+    3:3:void addMethodDependency(com.android.tools.r8.graph.ProgramMethod):147:147 -> a
+    4:4:void addRequiredInstanceFieldData(com.android.tools.r8.graph.DexField):151:151 -> a
+    1:1:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder access$100(com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):124:124 -> b
+    2:2:java.util.Set getRequiredInstanceFieldData():155:155 -> b
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods -> com.android.tools.r8.internal.TN0:
     1:1:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):47:47 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens -> com.android.tools.r8.internal.SN0:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens -> com.android.tools.r8.internal.VN0:
     boolean $assertionsDisabled -> o
     java.util.Map prototypeChangesPerMethod -> n
     1:1:void <clinit>():29:29 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeMap,java.util.Map,java.util.Map):39:40 -> <init>
-    1:2:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):49:50 -> a
-    3:3:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder enumUnboxingLensBuilder(com.android.tools.r8.graph.AppView):65:65 -> a
-    1:4: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):56:59 -> b
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder -> com.android.tools.r8.internal.RN0:
+    1:3:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):49:51 -> a
+    4:4:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder enumUnboxingLensBuilder(com.android.tools.r8.graph.AppView):66:66 -> a
+    1:4: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):57:60 -> b
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder -> com.android.tools.r8.internal.UN0:
     java.util.Map typeMap -> b
     boolean $assertionsDisabled -> f
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToManyRepresentativeMap newMethodSignatures -> d
     java.util.Map prototypeChangesPerMethod -> e
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newFieldSignatures -> c
-    1:1:void <clinit>():68:68 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):80:80 -> <init>
-    2:12:void <init>(com.android.tools.r8.graph.AppView):71:81 -> <init>
-    1:2:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder mapUnboxedEnums(java.util.Set):85:86 -> a
-    3:3:void move(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):95:95 -> a
-    4:35:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):108:139 -> a
-    36:38:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.RewrittenPrototypeDescription.withExtraUnusedNullParameters(int):474:476 -> a
-    36:38:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):139 -> a
-    39:39:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):136:136 -> a
-    40:42:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):144:146 -> a
-    43:46:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):145:148 -> a
-    47:50:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):147:150 -> a
-    51:54:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):149:152 -> a
-    55:55:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):151:151 -> a
-    56:62:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens build(com.android.tools.r8.graph.AppView):156:162 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter -> com.android.tools.r8.internal.TN0:
+    1:1:void <clinit>():69:69 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):81:81 -> <init>
+    2:12:void <init>(com.android.tools.r8.graph.AppView):72:82 -> <init>
+    1:2:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder mapUnboxedEnums(java.util.Set):86:87 -> a
+    3:3:void move(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):96:96 -> a
+    4:35:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):109:140 -> a
+    36:38:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.RewrittenPrototypeDescription.withExtraUnusedNullParameters(int):559:561 -> a
+    36:38:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):140 -> a
+    39:39:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):137:137 -> a
+    40:42:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):145:147 -> a
+    43:46:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):146:149 -> a
+    47:50:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):148:151 -> a
+    51:54:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):150:153 -> a
+    55:55:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):152:152 -> a
+    56:62:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens build(com.android.tools.r8.graph.AppView):157:163 -> a
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter -> com.android.tools.r8.internal.WN0:
     com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnumsData -> e
     java.util.Map checkNotNullToCheckNotZeroMapping -> b
     com.android.tools.r8.graph.DexItemFactory factory -> c
@@ -89753,7 +89875,7 @@ com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter -> com.android.tools
     417:417:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):517 -> a
     418:420:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):518:520 -> a
     421:425:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):524:528 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tools.r8.internal.VN0:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tools.r8.internal.YN0:
     com.android.tools.r8.ir.optimize.enums.EnumDataMap enumDataMap -> e
     com.android.tools.r8.graph.DexItemFactory factory -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -89769,7 +89891,7 @@ com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tool
     2:2:void lambda$duplicateCheckNotNullMethods$5(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):202:202 -> a
     3:59:java.util.Map duplicateCheckNotNullMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):144:200 -> a
     60:60:boolean lambda$duplicateCheckNotNullMethods$1(com.android.tools.r8.graph.ProgramMethod,java.util.Set):152:152 -> a
-    61:62:boolean com.android.tools.r8.utils.SetUtils.containsAnyOf(java.util.Set,java.lang.Iterable):18:19 -> a
+    61:62:boolean com.android.tools.r8.utils.SetUtils.containsAnyOf(java.util.Set,java.lang.Iterable):19:20 -> a
     61:62:boolean lambda$duplicateCheckNotNullMethods$1(com.android.tools.r8.graph.ProgramMethod,java.util.Set):152 -> a
     63:70:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,java.util.Map,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):160:167 -> a
     71:71:com.android.tools.r8.graph.DexType[] com.android.tools.r8.graph.DexTypeList.getBacking():63:63 -> a
@@ -89782,7 +89904,7 @@ com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tool
     92:110:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,java.util.Map,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):173:191 -> a
     111:114:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,java.util.Map,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):190:193 -> a
     115:118:void lambda$duplicateCheckNotNullMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):183:186 -> a
-    119:119:com.android.tools.r8.cf.CfVersion com.android.tools.r8.graph.DexEncodedMethod.getClassFileVersionOrElse(com.android.tools.r8.cf.CfVersion):848:848 -> a
+    119:119:com.android.tools.r8.cf.CfVersion com.android.tools.r8.graph.DexEncodedMethod.getClassFileVersionOrElse(com.android.tools.r8.cf.CfVersion):790:790 -> a
     119:119:void lambda$duplicateCheckNotNullMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):187 -> a
     120:125:void lambda$duplicateCheckNotNullMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):184:189 -> a
     126:126:com.android.tools.r8.graph.Code lambda$duplicateCheckNotNullMethods$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):188:188 -> a
@@ -89838,7 +89960,7 @@ com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tool
     364:368:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):463:467 -> a
     369:373:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):464:468 -> a
     374:384:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):462:472 -> a
-    385:385:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder.move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean):99:99 -> a
+    385:385:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder.move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean):100:100 -> a
     385:385:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):472 -> a
     386:387:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):475:476 -> a
     388:399:void lambda$createLocalUtilityMethod$15(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):480:491 -> a
@@ -89864,7 +89986,7 @@ com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tool
     437:437:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
     437:437:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.getRewrittenSimpleInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto):531 -> a
     437:437:void lambda$fixupEncodedMethod$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexEncodedMethod$Builder):526 -> a
-    438:438:boolean com.android.tools.r8.graph.DexEncodedMethod.isInstance():594:594 -> a
+    438:438:boolean com.android.tools.r8.graph.DexEncodedMethod.isInstance():536:536 -> a
     438:438:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.getRewrittenSimpleInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto):532 -> a
     438:438:void lambda$fixupEncodedMethod$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexEncodedMethod$Builder):526 -> a
     439:450:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.getRewrittenSimpleInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto):532:543 -> a
@@ -89887,7 +90009,7 @@ com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tool
     481:481:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):204:204 -> a
     481:481:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):576 -> a
     482:489:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):577:584 -> a
-    490:490:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> a
+    490:490:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> a
     490:490:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):585 -> a
     491:493:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):585:587 -> a
     494:494:void lambda$fixupFields$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField$Builder):583:583 -> a
@@ -89912,7 +90034,7 @@ com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tool
     25:25:void com.android.tools.r8.graph.DexClass.setStaticFields(java.util.Collection):412:412 -> c
     25:25:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):126 -> c
     26:37:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):128:139 -> c
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result -> com.android.tools.r8.internal.UN0:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result -> com.android.tools.r8.internal.XN0:
     java.util.Map checkNotNullToCheckNotZeroMapping -> a
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens lens -> b
     com.android.tools.r8.graph.PrunedItems prunedItems -> c
@@ -89920,13 +90042,13 @@ com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result -> com.andro
     1:1:java.util.Map getCheckNotNullToCheckNotZeroMapping():636:636 -> a
     1:1:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens getLens():640:640 -> b
     1:1:com.android.tools.r8.graph.PrunedItems getPrunedItems():644:644 -> c
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClass -> com.android.tools.r8.internal.WN0:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClass -> com.android.tools.r8.internal.ZN0:
     com.android.tools.r8.graph.DexProgramClass synthesizingContext -> a
     1:2:void <init>(com.android.tools.r8.graph.DexProgramClass):15:16 -> <init>
     void ensureMethods(com.android.tools.r8.graph.AppView) -> a
     com.android.tools.r8.graph.DexProgramClass getDefinition() -> a
     1:1:com.android.tools.r8.graph.DexProgramClass getSynthesizingContext():24:24 -> b
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses -> com.android.tools.r8.internal.ZN0:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses -> com.android.tools.r8.internal.cO0:
     com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass sharedUtilityClass -> b
     com.android.tools.r8.com.google.common.collect.ImmutableMap localUtilityClasses -> a
     boolean $assertionsDisabled -> c
@@ -89939,8 +90061,8 @@ com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses -> com.android
     3:3:void forEach(java.util.function.Consumer):42:42 -> a
     4:5:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass getLocalUtilityClass(com.android.tools.r8.graph.DexType):50:51 -> a
     6:6:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass getSharedUtilityClass():56:56 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses$1 -> com.android.tools.r8.internal.XN0:
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses$Builder -> com.android.tools.r8.internal.YN0:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses$1 -> com.android.tools.r8.internal.aO0:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses$Builder -> com.android.tools.r8.internal.bO0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder fieldAccessInfoCollectionModifierBuilder -> d
     com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass sharedUtilityClass -> c
@@ -89948,7 +90070,7 @@ com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses$Builder -> com
     1:1:void <init>(com.android.tools.r8.graph.AppView):72:72 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.AppView):70:73 -> <init>
     1:1:com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses$Builder synthesizeEnumUnboxingUtilityClasses(java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumDataMap):78:78 -> a
-    2:2:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,java.util.Set,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):72:72 -> a
+    2:2:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,java.util.Set,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):68:68 -> a
     2:2:com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses$Builder synthesizeEnumUnboxingUtilityClasses(java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumDataMap):79 -> a
     3:3:com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses$Builder synthesizeEnumUnboxingUtilityClasses(java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumDataMap):81:81 -> a
     4:8:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses$Builder.createLocalUtilityClasses(java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumDataMap):120:124 -> a
@@ -89968,7 +90090,7 @@ com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses$Builder -> com
     38:40:com.android.tools.r8.graph.DexType getUtilityClassType(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.graph.DexItemFactory):132:134 -> a
     41:41:com.android.tools.r8.graph.DexType getUtilityClassType(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.graph.DexItemFactory):133:133 -> a
     42:42:com.android.tools.r8.graph.DexType getUtilityClassType(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.graph.DexItemFactory):132:132 -> a
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer -> com.android.tools.r8.internal.cO0:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer -> com.android.tools.r8.internal.fO0:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -90082,8 +90204,8 @@ com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer -> com.android.tools.r
     94:94:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> b
     94:94:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):158 -> b
     95:97:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):158:160 -> b
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$1 -> com.android.tools.r8.internal.aO0:
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo -> com.android.tools.r8.internal.bO0:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$1 -> com.android.tools.r8.internal.dO0:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo -> com.android.tools.r8.internal.eO0:
     com.android.tools.r8.ir.code.Instruction ordinalInvoke -> b
     com.android.tools.r8.ir.code.Instruction arrayGet -> c
     com.android.tools.r8.ir.code.Instruction staticGet -> d
@@ -90091,7 +90213,7 @@ com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo -> com.
     com.android.tools.r8.graph.DexType enumClass -> a
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$1):355:355 -> <init>
     2:7: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):368:373 -> <init>
-com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass -> com.android.tools.r8.internal.B51:
+com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass -> com.android.tools.r8.internal.E51:
     com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData data -> c
     com.android.tools.r8.graph.DexProgramClass localUtilityClass -> b
     boolean $assertionsDisabled -> d
@@ -90130,8 +90252,8 @@ com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass -> com.andr
     1:5:com.android.tools.r8.graph.ProgramMethod ensureValueOfMethod(com.android.tools.r8.graph.AppView):101:105 -> c
     6:6:com.android.tools.r8.graph.ProgramMethod ensureValueOfMethod(com.android.tools.r8.graph.AppView):102:102 -> c
     7:7:com.android.tools.r8.graph.DexType getType():143:143 -> c
-com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass$1 -> com.android.tools.r8.internal.z51:
-com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.A51:
+com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass$1 -> com.android.tools.r8.internal.C51:
+com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.D51:
     com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData data -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexProgramClass enumToUnbox -> c
@@ -90143,104 +90265,104 @@ com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass$Builder ->
     1:2:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass build():166:167 -> a
     3:3:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):178:178 -> a
     1:9:com.android.tools.r8.graph.DexProgramClass createClass():171:179 -> b
-com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass -> com.android.tools.r8.internal.Rm1:
+com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass -> com.android.tools.r8.internal.Jm1:
     com.android.tools.r8.graph.DexProgramClass sharedUtilityClass -> b
     com.android.tools.r8.graph.ProgramMethod valuesMethod -> c
-    1:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):62:64 -> <init>
-    1:5:void ensureMethods(com.android.tools.r8.graph.AppView):78:82 -> a
-    6:6:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):91:91 -> a
+    1:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):58:60 -> <init>
+    1:5:void ensureMethods(com.android.tools.r8.graph.AppView):74:78 -> a
+    6:6:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):87:87 -> a
     7:27:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_zeroCheck(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):268:288 -> a
-    7:27:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):91 -> a
+    7:27:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):87 -> a
     28:38:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_zeroCheck(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):285:295 -> a
-    28:38:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):91 -> a
+    28:38:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):87 -> a
     39:39:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
     39:39:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_zeroCheck(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):295 -> a
-    39:39:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):91 -> a
+    39:39:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):87 -> a
     40:41:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_zeroCheck(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):295:296 -> a
-    40:41:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):91 -> a
+    40:41:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):87 -> a
     42:66:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_zeroCheck(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):276:300 -> a
-    42:66:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):91 -> a
-    67:74:com.android.tools.r8.graph.ProgramMethod internalEnsureMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):144:151 -> a
-    75:75:com.android.tools.r8.graph.ProgramMethod internalEnsureMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):145:145 -> a
-    76:78:void lambda$internalEnsureMethod$5(com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator,com.android.tools.r8.synthesis.SyntheticMethodBuilder):154:156 -> a
-    79:79:com.android.tools.r8.graph.DexProgramClass getDefinition():161:161 -> a
-    1:5:com.android.tools.r8.graph.ProgramMethod ensureCheckNotZeroMethod(com.android.tools.r8.graph.AppView):86:90 -> b
-    6:6:com.android.tools.r8.graph.ProgramMethod ensureCheckNotZeroMethod(com.android.tools.r8.graph.AppView):87:87 -> b
-    7:7:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroWithMessageMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):102:102 -> b
+    42:66:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):87 -> a
+    67:74:com.android.tools.r8.graph.ProgramMethod internalEnsureMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):140:147 -> a
+    75:75:com.android.tools.r8.graph.ProgramMethod internalEnsureMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):141:141 -> a
+    76:78:void lambda$internalEnsureMethod$5(com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator,com.android.tools.r8.synthesis.SyntheticMethodBuilder):150:152 -> a
+    79:79:com.android.tools.r8.graph.DexProgramClass getDefinition():157:157 -> a
+    1:5:com.android.tools.r8.graph.ProgramMethod ensureCheckNotZeroMethod(com.android.tools.r8.graph.AppView):82:86 -> b
+    6:6:com.android.tools.r8.graph.ProgramMethod ensureCheckNotZeroMethod(com.android.tools.r8.graph.AppView):83:83 -> b
+    7:7:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroWithMessageMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):98:98 -> b
     8:30:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_zeroCheckMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):305:327 -> b
-    8:30:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroWithMessageMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):102 -> b
+    8:30:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroWithMessageMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):98 -> b
     31:44:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_zeroCheckMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):323:336 -> b
-    31:44:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroWithMessageMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):102 -> b
+    31:44:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroWithMessageMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):98 -> b
     45:45:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> b
     45:45:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_zeroCheckMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):336 -> b
-    45:45:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroWithMessageMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):102 -> b
+    45:45:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroWithMessageMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):98 -> b
     46:48:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_zeroCheckMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):336:338 -> b
-    46:48:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroWithMessageMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):102 -> b
+    46:48:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroWithMessageMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):98 -> b
     49:78:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_zeroCheckMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):313:342 -> b
-    49:78:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroWithMessageMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):102 -> b
-    1:5:com.android.tools.r8.graph.ProgramMethod ensureCheckNotZeroWithMessageMethod(com.android.tools.r8.graph.AppView):95:99 -> c
-    6:6:com.android.tools.r8.graph.ProgramMethod ensureCheckNotZeroWithMessageMethod(com.android.tools.r8.graph.AppView):96:96 -> c
-    7:7:com.android.tools.r8.graph.Code lambda$ensureCompareToMethod$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):112:112 -> c
+    49:78:com.android.tools.r8.graph.Code lambda$ensureCheckNotZeroWithMessageMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):98 -> b
+    1:5:com.android.tools.r8.graph.ProgramMethod ensureCheckNotZeroWithMessageMethod(com.android.tools.r8.graph.AppView):91:95 -> c
+    6:6:com.android.tools.r8.graph.ProgramMethod ensureCheckNotZeroWithMessageMethod(com.android.tools.r8.graph.AppView):92:92 -> c
+    7:7:com.android.tools.r8.graph.Code lambda$ensureCompareToMethod$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):108:108 -> c
     8:28:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):51:71 -> c
-    8:28:com.android.tools.r8.graph.Code lambda$ensureCompareToMethod$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):112 -> c
+    8:28:com.android.tools.r8.graph.Code lambda$ensureCompareToMethod$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):108 -> c
     29:29:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> c
     29:29:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):71 -> c
-    29:29:com.android.tools.r8.graph.Code lambda$ensureCompareToMethod$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):112 -> c
+    29:29:com.android.tools.r8.graph.Code lambda$ensureCompareToMethod$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):108 -> c
     30:40:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):71:81 -> c
-    30:40:com.android.tools.r8.graph.Code lambda$ensureCompareToMethod$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):112 -> c
+    30:40:com.android.tools.r8.graph.Code lambda$ensureCompareToMethod$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):108 -> c
     41:53:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):78:90 -> c
-    41:53:com.android.tools.r8.graph.Code lambda$ensureCompareToMethod$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):112 -> c
+    41:53:com.android.tools.r8.graph.Code lambda$ensureCompareToMethod$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):108 -> c
     54:54:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> c
     54:54:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):90 -> c
-    54:54:com.android.tools.r8.graph.Code lambda$ensureCompareToMethod$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):112 -> c
+    54:54:com.android.tools.r8.graph.Code lambda$ensureCompareToMethod$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):108 -> c
     55:57:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):90:92 -> c
-    55:57:com.android.tools.r8.graph.Code lambda$ensureCompareToMethod$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):112 -> c
+    55:57:com.android.tools.r8.graph.Code lambda$ensureCompareToMethod$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):108 -> c
     58:98:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):59:99 -> c
-    58:98:com.android.tools.r8.graph.Code lambda$ensureCompareToMethod$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):112 -> c
-    99:99:com.android.tools.r8.graph.DexType getType():169:169 -> c
-    1:5:com.android.tools.r8.graph.ProgramMethod ensureCompareToMethod(com.android.tools.r8.graph.AppView):106:110 -> d
-    6:6:com.android.tools.r8.graph.ProgramMethod ensureCompareToMethod(com.android.tools.r8.graph.AppView):107:107 -> d
-    7:7:com.android.tools.r8.graph.Code lambda$ensureEqualsMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):122:122 -> d
+    58:98:com.android.tools.r8.graph.Code lambda$ensureCompareToMethod$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):108 -> c
+    99:99:com.android.tools.r8.graph.DexType getType():165:165 -> c
+    1:5:com.android.tools.r8.graph.ProgramMethod ensureCompareToMethod(com.android.tools.r8.graph.AppView):102:106 -> d
+    6:6:com.android.tools.r8.graph.ProgramMethod ensureCompareToMethod(com.android.tools.r8.graph.AppView):103:103 -> d
+    7:7:com.android.tools.r8.graph.Code lambda$ensureEqualsMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):118:118 -> d
     8:30:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):103:125 -> d
-    8:30:com.android.tools.r8.graph.Code lambda$ensureEqualsMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):122 -> d
+    8:30:com.android.tools.r8.graph.Code lambda$ensureEqualsMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):118 -> d
     31:43:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):122:134 -> d
-    31:43:com.android.tools.r8.graph.Code lambda$ensureEqualsMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):122 -> d
+    31:43:com.android.tools.r8.graph.Code lambda$ensureEqualsMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):118 -> d
     44:44:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> d
     44:44:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):134 -> d
-    44:44:com.android.tools.r8.graph.Code lambda$ensureEqualsMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):122 -> d
+    44:44:com.android.tools.r8.graph.Code lambda$ensureEqualsMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):118 -> d
     45:59:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):134:148 -> d
-    45:59:com.android.tools.r8.graph.Code lambda$ensureEqualsMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):122 -> d
+    45:59:com.android.tools.r8.graph.Code lambda$ensureEqualsMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):118 -> d
     60:60:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> d
     60:60:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):148 -> d
-    60:60:com.android.tools.r8.graph.Code lambda$ensureEqualsMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):122 -> d
+    60:60:com.android.tools.r8.graph.Code lambda$ensureEqualsMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):118 -> d
     61:71:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):148:158 -> d
-    61:71:com.android.tools.r8.graph.Code lambda$ensureEqualsMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):122 -> d
+    61:71:com.android.tools.r8.graph.Code lambda$ensureEqualsMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):118 -> d
     72:72:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> d
     72:72:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):158 -> d
-    72:72:com.android.tools.r8.graph.Code lambda$ensureEqualsMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):122 -> d
+    72:72:com.android.tools.r8.graph.Code lambda$ensureEqualsMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):118 -> d
     73:76:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):158:161 -> d
-    73:76:com.android.tools.r8.graph.Code lambda$ensureEqualsMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):122 -> d
+    73:76:com.android.tools.r8.graph.Code lambda$ensureEqualsMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):118 -> d
     77:129:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):113:165 -> d
-    77:129:com.android.tools.r8.graph.Code lambda$ensureEqualsMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):122 -> d
-    130:130:com.android.tools.r8.graph.ProgramMethod getValuesMethod():165:165 -> d
-    1:5:com.android.tools.r8.graph.ProgramMethod ensureEqualsMethod(com.android.tools.r8.graph.AppView):116:120 -> e
-    6:6:com.android.tools.r8.graph.ProgramMethod ensureEqualsMethod(com.android.tools.r8.graph.AppView):117:117 -> e
-    7:7:com.android.tools.r8.graph.Code lambda$ensureOrdinalMethod$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):131:131 -> e
+    77:129:com.android.tools.r8.graph.Code lambda$ensureEqualsMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):118 -> d
+    130:130:com.android.tools.r8.graph.ProgramMethod getValuesMethod():161:161 -> d
+    1:5:com.android.tools.r8.graph.ProgramMethod ensureEqualsMethod(com.android.tools.r8.graph.AppView):112:116 -> e
+    6:6:com.android.tools.r8.graph.ProgramMethod ensureEqualsMethod(com.android.tools.r8.graph.AppView):113:113 -> e
+    7:7:com.android.tools.r8.graph.Code lambda$ensureOrdinalMethod$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):127:127 -> e
     8:28:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):169:189 -> e
-    8:28:com.android.tools.r8.graph.Code lambda$ensureOrdinalMethod$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):131 -> e
+    8:28:com.android.tools.r8.graph.Code lambda$ensureOrdinalMethod$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):127 -> e
     29:39:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):186:196 -> e
-    29:39:com.android.tools.r8.graph.Code lambda$ensureOrdinalMethod$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):131 -> e
+    29:39:com.android.tools.r8.graph.Code lambda$ensureOrdinalMethod$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):127 -> e
     40:40:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> e
     40:40:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):196 -> e
-    40:40:com.android.tools.r8.graph.Code lambda$ensureOrdinalMethod$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):131 -> e
+    40:40:com.android.tools.r8.graph.Code lambda$ensureOrdinalMethod$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):127 -> e
     41:42:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):196:197 -> e
-    41:42:com.android.tools.r8.graph.Code lambda$ensureOrdinalMethod$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):131 -> e
+    41:42:com.android.tools.r8.graph.Code lambda$ensureOrdinalMethod$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):127 -> e
     43:70:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):177:204 -> e
-    43:70:com.android.tools.r8.graph.Code lambda$ensureOrdinalMethod$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):131 -> e
-    1:5:com.android.tools.r8.graph.ProgramMethod ensureOrdinalMethod(com.android.tools.r8.graph.AppView):126:130 -> f
-    6:6:com.android.tools.r8.graph.ProgramMethod ensureOrdinalMethod(com.android.tools.r8.graph.AppView):127:127 -> f
-com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$1 -> com.android.tools.r8.internal.Pm1:
-com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.Qm1:
+    43:70:com.android.tools.r8.graph.Code lambda$ensureOrdinalMethod$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):127 -> e
+    1:5:com.android.tools.r8.graph.ProgramMethod ensureOrdinalMethod(com.android.tools.r8.graph.AppView):122:126 -> f
+    6:6:com.android.tools.r8.graph.ProgramMethod ensureOrdinalMethod(com.android.tools.r8.graph.AppView):123:123 -> f
+com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$1 -> com.android.tools.r8.internal.Hm1:
+com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.Im1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder fieldAccessInfoCollectionModifierBuilder -> d
@@ -90248,95 +90370,112 @@ com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder ->
     boolean $assertionsDisabled -> g
     com.android.tools.r8.graph.DexProgramClass synthesizingContext -> e
     com.android.tools.r8.graph.DexEncodedMethod valuesMethod -> f
-    1:1:void <clinit>():172:172 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,java.util.Set,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$1):172:172 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,java.util.Set,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):187:193 -> <init>
-    1:2:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass build():197:198 -> a
-    3:3:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):213:213 -> a
-    4:6:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesField(com.android.tools.r8.graph.DexType):230:232 -> a
-    4:6:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
-    7:7:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.FieldAccessFlags.createPublicStaticFinalSynthetic():62:62 -> a
-    7:7:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesField(com.android.tools.r8.graph.DexType):234 -> a
-    7:7:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
-    8:16:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesField(com.android.tools.r8.graph.DexType):235:243 -> a
-    8:16:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
-    17:17:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):251:251 -> a
-    17:17:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):218 -> a
-    18:18:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2301:2301 -> a
-    18:18:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):252 -> a
-    18:18:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):218 -> a
-    19:19:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.createForClassInitializer():79:79 -> a
-    19:19:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):253 -> a
-    19:19:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):218 -> a
-    20:22:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):254:256 -> a
-    20:22:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):218 -> a
-    23:35:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializerCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):266:278 -> a
-    23:35:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):257 -> a
-    23:35:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):218 -> a
-    36:36:void com.android.tools.r8.cf.code.CfFieldInstruction.<init>(int,com.android.tools.r8.graph.DexField):46:46 -> a
-    36:36:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializerCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):278 -> a
-    36:36:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):257 -> a
-    36:36:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):218 -> a
-    37:48:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializerCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):278:289 -> a
-    37:48:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):257 -> a
-    37:48:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):218 -> a
-    49:53:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):257:261 -> a
-    49:53:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):218 -> a
-    54:54:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):277:277 -> a
-    54:54:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):261 -> a
-    54:54:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):218 -> a
-    55:59:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):294:298 -> a
-    55:59:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):219 -> a
-    60:67:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):296:303 -> a
-    60:67:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):219 -> a
-    68:78:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethodCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):319:329 -> a
-    68:78:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):304 -> a
-    68:78:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):219 -> a
-    79:79:void com.android.tools.r8.cf.code.CfFieldInstruction.<init>(int,com.android.tools.r8.graph.DexField):46:46 -> a
-    79:79:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethodCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):329 -> a
-    79:79:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):304 -> a
-    79:79:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):219 -> a
-    80:80:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethodCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):329:329 -> a
-    80:80:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):304 -> a
-    80:80:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):219 -> a
-    81:98:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethodCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):323:340 -> a
-    81:98:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):304 -> a
-    81:98:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):219 -> a
-    99:103:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):304:308 -> a
-    99:103:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):219 -> a
-    104:104:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):277:277 -> a
-    104:104:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):308 -> a
-    104:104:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):219 -> a
-    105:105:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):309:309 -> a
-    105:105:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):219 -> a
-    106:106:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):217:217 -> a
-    107:112:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):216:221 -> a
-    113:116:com.android.tools.r8.graph.DexProgramClass findDeterministicContextType(java.util.Set):345:348 -> a
-    1:19:com.android.tools.r8.graph.DexProgramClass createClass():205:223 -> b
-com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification -> com.android.tools.r8.internal.YF0:
+    1:1:void <clinit>():168:168 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,java.util.Set,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$1):168:168 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,java.util.Set,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):183:189 -> <init>
+    1:2:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass build():193:194 -> a
+    3:3:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):209:209 -> a
+    4:6:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesField(com.android.tools.r8.graph.DexType):227:229 -> a
+    4:6:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):210 -> a
+    7:7:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesField(com.android.tools.r8.graph.DexType):228:228 -> a
+    7:7:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):210 -> a
+    8:8:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.FieldAccessFlags.createPublicStaticFinalSynthetic():62:62 -> a
+    8:8:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesField(com.android.tools.r8.graph.DexType):231 -> a
+    8:8:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):210 -> a
+    9:14:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesField(com.android.tools.r8.graph.DexType):231:236 -> a
+    9:14:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):210 -> a
+    15:15:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):244:244 -> a
+    15:15:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
+    16:16:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2301:2301 -> a
+    16:16:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):245 -> a
+    16:16:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
+    17:17:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):245:245 -> a
+    17:17:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
+    18:18:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.createForClassInitializer():79:79 -> a
+    18:18:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):246 -> a
+    18:18:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
+    19:19:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):246:246 -> a
+    19:19:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
+    20:32:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializerCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):256:268 -> a
+    20:32:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):247 -> a
+    20:32:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
+    33:33:void com.android.tools.r8.cf.code.CfFieldInstruction.<init>(int,com.android.tools.r8.graph.DexField):46:46 -> a
+    33:33:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializerCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):268 -> a
+    33:33:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):247 -> a
+    33:33:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
+    34:45:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializerCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):268:279 -> a
+    34:45:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):247 -> a
+    34:45:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
+    46:50:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):247:251 -> a
+    46:50:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> a
+    51:55:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):285:289 -> a
+    51:55:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
+    56:56:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):287:287 -> a
+    56:56:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
+    57:63:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):286:292 -> a
+    57:63:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
+    64:74:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethodCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):308:318 -> a
+    64:74:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):293 -> a
+    64:74:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
+    75:75:void com.android.tools.r8.cf.code.CfFieldInstruction.<init>(int,com.android.tools.r8.graph.DexField):46:46 -> a
+    75:75:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethodCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):318 -> a
+    75:75:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):293 -> a
+    75:75:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
+    76:76:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethodCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):318:318 -> a
+    76:76:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):293 -> a
+    76:76:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
+    77:94:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethodCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):312:329 -> a
+    77:94:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):293 -> a
+    77:94:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
+    95:100:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder.createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):293:298 -> a
+    95:100:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
+    101:101:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):213:213 -> a
+    102:107:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):212:217 -> a
+    108:111:com.android.tools.r8.graph.DexProgramClass findDeterministicContextType(java.util.Set):334:337 -> a
+    1:19:com.android.tools.r8.graph.DexProgramClass createClass():201:219 -> b
+com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification -> com.android.tools.r8.internal.bG0:
     int argumentIndex -> b
-    1:2:void <init>(int):15:16 -> <init>
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():15:15 -> <clinit>
+    1:2:void <init>(int):20:21 -> <init>
     com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification asCheckNotNullClassification() -> a
-    1:2:boolean isUseEligibleForUnboxing(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.Value):24:25 -> a
-    3:3:int com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification.getArgumentIndex():20:20 -> a
-    3:3:boolean isUseEligibleForUnboxing(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.Value):26 -> a
-    4:4:boolean isUseEligibleForUnboxing(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.Value):30:30 -> a
-    1:1:int getArgumentIndex():20:20 -> d
-com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification -> com.android.tools.r8.internal.IN0:
+    1:2:boolean isUseEligibleForUnboxing(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.Value):29:30 -> a
+    3:3:int com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification.getArgumentIndex():25:25 -> a
+    3:3:boolean isUseEligibleForUnboxing(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.Value):31 -> a
+    4:4:boolean isUseEligibleForUnboxing(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.Value):35:35 -> a
+    5:5:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParameterRemoval(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):41:41 -> a
+    6:6:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.unknown():12:12 -> a
+    6:6:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParameterRemoval(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):52 -> a
+    7:10:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParameterRemoval(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):57:60 -> a
+    11:11:int com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification.getArgumentIndex():25:25 -> a
+    11:11:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParameterRemoval(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):61 -> a
+    12:18:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParameterRemoval(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):64:70 -> a
+    19:20:boolean com.android.tools.r8.utils.IteratorUtils.allRemainingMatchDestructive(java.util.Iterator,java.util.function.Predicate):170:171 -> a
+    19:20:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParameterRemoval(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):70 -> a
+    21:25:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParameterRemoval(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):70:74 -> a
+    26:26:int com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification.getArgumentIndex():25:25 -> a
+    26:26:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParameterRemoval(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):75 -> a
+    27:27:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParameterRemoval(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):75:75 -> a
+    28:28:boolean lambda$fixupAfterParameterRemoval$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):71:71 -> a
+    29:29:int com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification.getArgumentIndex():25:25 -> a
+    29:29:boolean lambda$fixupAfterParameterRemoval$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):71 -> a
+    1:1:int getArgumentIndex():25:25 -> d
+com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification -> com.android.tools.r8.internal.LN0:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():7:7 -> <clinit>
-    1:1:void <init>():7:7 -> <init>
+    1:1:void <clinit>():9:9 -> <clinit>
+    1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification asCheckNotNullClassification() -> a
-    1:1:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterRemovingThisParameter():15:15 -> b
+    com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParameterRemoval(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection) -> a
+    1:1:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterRemovingThisParameter():20:20 -> b
     2:2:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isUnknownClassification():0:0 -> b
-    2:2:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterRemovingThisParameter():15 -> b
-    3:3:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterRemovingThisParameter():15:15 -> b
-    4:4:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.unknown():10:10 -> b
-    4:4:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterRemovingThisParameter():16 -> b
-    1:1:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification unknown():10:10 -> c
-com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassificationAnalysis -> com.android.tools.r8.internal.JN0:
+    2:2:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterRemovingThisParameter():20 -> b
+    3:3:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterRemovingThisParameter():20:20 -> b
+    4:4:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.unknown():12:12 -> b
+    4:4:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterRemovingThisParameter():21 -> b
+    1:1:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification unknown():12:12 -> c
+com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassificationAnalysis -> com.android.tools.r8.internal.MN0:
     1:1:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):38:38 -> a
-    2:2:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.unknown():10:10 -> a
+    2:2:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.unknown():12:12 -> a
     2:2:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):40 -> a
     3:14:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):43:54 -> a
     15:32:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassificationAnalysis.onlyHasCheckNotNullUsers(com.android.tools.r8.ir.code.Argument,com.android.tools.r8.ir.conversion.MethodProcessor):69:86 -> a
@@ -90344,16 +90483,17 @@ com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassific
     33:59:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassificationAnalysis.onlyHasCheckNotNullUsers(com.android.tools.r8.ir.code.Argument,com.android.tools.r8.ir.conversion.MethodProcessor):78:104 -> a
     33:59:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):58 -> a
     60:60:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):59:59 -> a
-    61:61:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.unknown():10:10 -> a
+    61:61:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.unknown():12:12 -> a
     61:61:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):63 -> a
-    62:62:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.unknown():10:10 -> a
+    62:62:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.unknown():12:12 -> a
     62:62:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):45 -> a
-com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification -> com.android.tools.r8.internal.Vr1:
+com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification -> com.android.tools.r8.internal.Nr1:
     com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification INSTANCE -> b
-    1:1:void <clinit>():9:9 -> <clinit>
-    1:1:void <init>():12:12 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification getInstance():15:15 -> d
-com.android.tools.r8.ir.optimize.enums.code.CheckNotZeroCode -> com.android.tools.r8.internal.ZF0:
+    1:1:void <clinit>():11:11 -> <clinit>
+    1:1:void <init>():14:14 -> <init>
+    com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParameterRemoval(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection) -> a
+    1:1:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification getInstance():17:17 -> d
+com.android.tools.r8.ir.optimize.enums.code.CheckNotZeroCode -> com.android.tools.r8.internal.cG0:
     com.android.tools.r8.graph.ProgramMethod checkNotNullMethod -> c
     1:2:void <init>(com.android.tools.r8.graph.ProgramMethod):39:40 -> <init>
     1:1:int computeHashCode():95:95 -> M
@@ -90389,67 +90529,38 @@ com.android.tools.r8.ir.optimize.enums.code.CheckNotZeroCode -> com.android.tool
     40:40:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):125:125 -> a
     1:1:boolean computeEquals(java.lang.Object):90:90 -> g
     1:1:java.lang.String toString():120:120 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason -> com.android.tools.r8.internal.Ai1:
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INVOKE_ON_ARRAY -> p
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INVOKE_CUSTOM -> o
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_FIELD_PUT -> r
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason IMPLICIT_UP_CAST_IN_RETURN -> q
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason TYPE_MISMATCH_FIELD_PUT -> t
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_ARRAY_PUT -> s
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason ENUM_METHOD_CALLED_WITH_NULL_RECEIVER -> v
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_IF_TYPES -> u
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason UNRESOLVABLE_FIELD -> h
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason DEFAULT_METHOD_INVOKE -> g
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_PHI -> j
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason CONST_CLASS -> i
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_CLINIT -> l
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INIT -> k
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INVOKE_CLASSPATH -> n
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INVOKE -> m
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason ANNOTATION -> b
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason -> com.android.tools.r8.internal.yi1:
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason TYPE_MISMATCH_FIELD_PUT -> p
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_ARRAY_PUT -> o
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason ENUM_METHOD_CALLED_WITH_NULL_RECEIVER -> r
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_IF_TYPES -> q
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason OTHER_UNSUPPORTED_INSTRUCTION -> s
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_CLINIT -> h
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INIT -> g
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INVOKE_CLASSPATH -> j
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INVOKE -> i
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INVOKE_ON_ARRAY -> l
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INVOKE_CUSTOM -> k
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_FIELD_PUT -> n
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason IMPLICIT_UP_CAST_IN_RETURN -> m
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason DOWN_CAST -> b
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason ELIGIBLE -> a
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason DOWN_CAST -> d
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason PINNED -> c
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason MANY_INSTANCE_FIELDS -> f
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason SUBTYPES -> e
-    com.android.tools.r8.ir.optimize.enums.eligibility.Reason OTHER_UNSUPPORTED_INSTRUCTION -> w
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason UNRESOLVABLE_FIELD -> d
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason DEFAULT_METHOD_INVOKE -> c
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_PHI -> f
+    com.android.tools.r8.ir.optimize.enums.eligibility.Reason CONST_CLASS -> e
     1:28:void <clinit>():12:39 -> <clinit>
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$IllegalInvokeWithImpreciseParameterTypeReason -> com.android.tools.r8.internal.si1:
-    com.android.tools.r8.graph.DexMethod invokedMethod -> x
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$IllegalInvokeWithImpreciseParameterTypeReason -> com.android.tools.r8.internal.vi1:
+    com.android.tools.r8.graph.DexMethod invokedMethod -> t
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):70:71 -> <init>
     1:1:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$MissingContentsForEnumValuesArrayReason -> com.android.tools.r8.internal.ti1:
-    com.android.tools.r8.graph.DexField valuesField -> x
-    1:2:void <init>(com.android.tools.r8.graph.DexField):102:103 -> <init>
-    1:1:java.lang.String toString():113:113 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$MissingEnumStaticFieldValuesReason -> com.android.tools.r8.internal.ui1:
-    1:1:void <init>():85:85 -> <init>
-    1:1:java.lang.String toString():94:94 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$MissingInstanceFieldValueForEnumInstanceReason -> com.android.tools.r8.internal.vi1:
-    com.android.tools.r8.graph.DexField instanceField -> z
-    com.android.tools.r8.graph.DexField enumField -> x
-    int ordinal -> y
-    boolean $assertionsDisabled -> A
-    1:1:void <clinit>():117:117 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):124:127 -> <init>
-    5:8:void <init>(int,com.android.tools.r8.graph.DexField):130:133 -> <init>
-    1:12:java.lang.String toString():143:154 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$MissingObjectStateForEnumInstanceReason -> com.android.tools.r8.internal.wi1:
-    com.android.tools.r8.graph.DexField enumField -> x
-    1:2:void <init>(com.android.tools.r8.graph.DexField):163:164 -> <init>
-    1:1:java.lang.String toString():174:174 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$StringReason -> com.android.tools.r8.internal.xi1:
-    java.lang.String message -> x
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$StringReason -> com.android.tools.r8.internal.wi1:
+    java.lang.String message -> t
     1:2:void <init>(java.lang.String):51:52 -> <init>
     1:1:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$UnsupportedInstanceFieldValueForEnumInstanceReason -> com.android.tools.r8.internal.yi1:
-    com.android.tools.r8.graph.DexField instanceField -> y
-    int ordinal -> x
-    1:3:void <init>(int,com.android.tools.r8.graph.DexField):183:185 -> <init>
-    1:4:java.lang.String toString():195:198 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$UnsupportedLibraryInvokeReason -> com.android.tools.r8.internal.zi1:
-    com.android.tools.r8.graph.DexMethod invokedMethod -> x
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$UnsupportedLibraryInvokeReason -> com.android.tools.r8.internal.xi1:
+    com.android.tools.r8.graph.DexMethod invokedMethod -> t
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):207:208 -> <init>
     1:1:java.lang.String toString():218:218 -> toString
 com.android.tools.r8.ir.optimize.info.AbandonedCallSiteOptimizationInfo -> com.android.tools.r8.internal.a:
@@ -90457,12 +90568,12 @@ com.android.tools.r8.ir.optimize.info.AbandonedCallSiteOptimizationInfo -> com.a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.AbandonedCallSiteOptimizationInfo getInstance():18:18 -> f
-com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo -> com.android.tools.r8.internal.jC0:
+com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo -> com.android.tools.r8.internal.mC0:
     com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo INSTANCE -> b
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo getInstance():15:15 -> f
-com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo -> com.android.tools.r8.internal.NC0:
+com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo -> com.android.tools.r8.internal.QC0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():16:16 -> <init>
@@ -90493,7 +90604,7 @@ com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo -> com.android.to
     1:1:com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo bottom():23:23 -> c
     boolean isTop() -> d
     1:1:com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo top():27:27 -> e
-com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo -> com.android.tools.r8.internal.ZI0:
+com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo -> com.android.tools.r8.internal.cJ0:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap constants -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap dynamicUpperBoundTypes -> c
@@ -90510,7 +90621,7 @@ com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo -> com.an
     38:38:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo join(com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):84 -> a
     39:46:com.android.tools.r8.ir.analysis.type.TypeElement[] com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo.getStaticTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):88:95 -> a
     39:46:boolean hasUsefulOptimizationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):104 -> a
-    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getParameter(int):377:377 -> a
+    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getParameter(int):319:319 -> a
     47:47:com.android.tools.r8.ir.analysis.type.TypeElement[] com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo.getStaticTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):97 -> a
     47:47:boolean hasUsefulOptimizationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):104 -> a
     48:48:com.android.tools.r8.ir.analysis.type.TypeElement[] com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo.getStaticTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):97:97 -> a
@@ -90528,24 +90639,22 @@ com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo -> com.an
     142:142:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):58:58 -> a
     142:142:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):230 -> a
     143:148:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):231:236 -> a
-    149:149:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createNullValue():37:37 -> a
-    149:149:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):236 -> a
-    150:154:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):235:239 -> a
-    155:155:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.asDefinitelyNull():82:82 -> a
-    155:155:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):239 -> a
-    156:162:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):238:244 -> a
-    163:163:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.asDefinitelyNotNull():86:86 -> a
-    163:163:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):244 -> a
-    164:177:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):243:256 -> a
-    178:178:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):255:255 -> a
-    179:179:com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.top():27:27 -> a
-    179:179:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):262 -> a
+    149:153:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):235:239 -> a
+    154:154:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.asDefinitelyNull():82:82 -> a
+    154:154:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):239 -> a
+    155:161:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):238:244 -> a
+    162:162:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.asDefinitelyNotNull():86:86 -> a
+    162:162:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):244 -> a
+    163:176:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):243:256 -> a
+    177:177:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):255:255 -> a
+    178:178:com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.top():27:27 -> a
+    178:178:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):262 -> a
     com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo asConcreteCallSiteOptimizationInfo() -> b
     1:3:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(int):139:141 -> b
     1:6:boolean equals(java.lang.Object):277:282 -> equals
     1:2:int hashCode():287:288 -> hashCode
     1:2:java.lang.String toString():293:294 -> toString
-com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.internal.pK0:
+com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.internal.sK0:
     com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo INSTANCE -> b
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():16:16 -> <init>
@@ -90559,7 +90668,7 @@ com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.androi
     boolean isDead() -> j
     boolean valueHasBeenPropagated() -> k
     1:1:com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo getInstance():19:19 -> l
-com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.internal.wK0:
+com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.internal.zK0:
     com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo DEFAULT_INSTANCE -> a
     boolean UNKNOWN_MAY_HAVE_SIDE_EFFECTS -> e
     boolean $assertionsDisabled -> f
@@ -90597,7 +90706,7 @@ com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.andro
     boolean neverInline() -> x
     boolean neverReturnsNormally() -> y
     boolean returnValueHasBeenPropagated() -> z
-com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.internal.XO0:
+com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.internal.aP0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -90609,18 +90718,18 @@ com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools
     int getReadBits() -> i
     boolean isDead() -> j
     boolean valueHasBeenPropagated() -> k
-com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback -> com.android.tools.r8.internal.L41:
+com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback -> com.android.tools.r8.internal.O41:
     com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback INSTANCE -> b
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     1:1:void recordLibraryFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue):23:23 -> a
     1:1:com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback getInstance():18:18 -> b
-com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo -> com.android.tools.r8.internal.N61:
+com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo -> com.android.tools.r8.internal.Q61:
     com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo asMutableMethodOptimizationInfo() -> a
     com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo toMutableOptimizationInfo() -> b
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo asMutableFieldOptimizationInfo() -> c
     boolean isMutableOptimizationInfo() -> d
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.internal.H71:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.internal.K71:
     1:1:void <init>():22:22 -> <init>
     boolean returnValueOnlyDependsOnArguments() -> A
     boolean returnsArgument() -> B
@@ -90649,7 +90758,7 @@ com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tool
     boolean neverInline() -> x
     boolean neverReturnsNormally() -> y
     boolean returnValueHasBeenPropagated() -> z
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.internal.J71:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.internal.M71:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization checkCastAndInstanceOfMethodSpecialization -> b
@@ -90903,7 +91012,7 @@ com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.and
     954:956:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):754:756 -> a
     957:980:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):918:941 -> a
     981:981:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):940:940 -> a
-    982:982:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():489:489 -> a
+    982:982:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():431:431 -> a
     982:982:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):950 -> a
     983:983:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):953:953 -> a
     984:995:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexProgramClass):986:997 -> a
@@ -90916,14 +91025,14 @@ com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.and
     1068:1113:boolean isNonNullOnNormalExit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):1137 -> a
     1114:1114:boolean lambda$isNonNullOnNormalExit$4(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):1108:1108 -> a
     boolean lambda$computeMayHaveSideEffects$3(com.android.tools.r8.graph.DexProgramClass) -> b
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.internal.I71:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.internal.L71:
     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>():710:713 -> <clinit>
     1:1:void <init>(java.lang.String,int):709:709 -> <init>
-com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.internal.l91:
+com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.internal.o91:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement dynamicLowerBoundType -> e
     int readBits -> d
     boolean $assertionsDisabled -> g
@@ -90954,7 +91063,7 @@ com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.androi
     1:1:void markAsPropagated():136:136 -> m
     1:1:void markCannotBeKept():100:100 -> n
     1:2:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():67:68 -> o
-com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo -> com.android.tools.r8.internal.m91:
+com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo -> com.android.tools.r8.internal.p91:
     int flags -> n
     com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo bridgeInfo -> i
     int DEFAULT_FLAGS -> o
@@ -90979,23 +91088,24 @@ com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo -> com.andro
     2:100:void <init>():36:134 -> <init>
     101:101:void <init>(com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):142:142 -> <init>
     102:222:void <init>(com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):36:156 -> <init>
-    1:1:boolean returnValueOnlyDependsOnArguments():404:404 -> A
-    1:1:boolean returnsArgument():315:315 -> B
-    1:1:boolean triggersClassInitBeforeAnySideEffect():383:383 -> C
-    1:1:void markAsPropagated():523:523 -> D
+    1:1:boolean returnValueOnlyDependsOnArguments():408:408 -> A
+    1:1:boolean returnsArgument():319:319 -> B
+    1:1:boolean triggersClassInitBeforeAnySideEffect():387:387 -> C
+    1:1:void markAsPropagated():527:527 -> D
     1:1:void markCannotBeKept():226:226 -> E
     1:1:void markClassInitializerMayBePostponed():235:235 -> F
-    1:2:void markForceInline():495:496 -> G
-    1:1:void markInlinedIntoSingleCallSite():305:305 -> H
-    1:1:void markMayNotHaveSideEffects():443:443 -> I
-    1:1:void markNeverReturnsNormally():451:451 -> J
-    1:1:void markReturnValueOnlyDependsOnArguments():447:447 -> K
-    1:1:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo mutableCopy():547:547 -> L
-    1:1:void setInitializerEnablingJavaAssertions():429:429 -> M
-    1:1:void unsetAbstractReturnValue():461:461 -> N
-    1:1:void unsetBridgeInfo():339:339 -> O
+    1:2:void markForceInline():499:500 -> G
+    1:1:void markInlinedIntoSingleCallSite():309:309 -> H
+    1:1:void markMayNotHaveSideEffects():447:447 -> I
+    1:1:void markNeverReturnsNormally():455:455 -> J
+    1:1:void markReturnValueOnlyDependsOnArguments():451:451 -> K
+    1:1:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo mutableCopy():551:551 -> L
+    1:1:void setInitializerEnablingJavaAssertions():433:433 -> M
+    1:1:void unsetAbstractReturnValue():465:465 -> N
+    1:1:void unsetBridgeInfo():343:343 -> O
     1:1:void unsetClassInlinerMethodConstraint():248:248 -> P
-    1:2:void unsetForceInline():502:503 -> Q
+    1:1:void unsetEnumUnboxerMethodClassification():265:265 -> Q
+    1:2:void unsetForceInline():506:507 -> R
     com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo asMutableMethodOptimizationInfo() -> a
     1:13:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,java.util.Set):168:180 -> a
     14:14:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupAbstractReturnValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):188:188 -> a
@@ -91013,66 +91123,66 @@ com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo -> com.andro
     24:24:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isCheckNotNullClassification():0:0 -> a
     24:24:void setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):260 -> a
     25:27:void setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):259:261 -> a
-    28:28:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getInstanceInitializerInfo(com.android.tools.r8.ir.code.InvokeDirect):286:286 -> a
-    29:29:void setBridgeInfo(com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):335:335 -> a
-    30:30:boolean com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.mayHaveSideEffects():388:388 -> a
-    30:30:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):393 -> a
-    31:31:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.getNopInliningConstraint(com.android.tools.r8.utils.InternalOptions):352:352 -> a
-    31:31:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):396 -> a
-    32:32:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.getSimpleInliningConstraint():358:358 -> a
-    32:32:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.getNopInliningConstraint(com.android.tools.r8.utils.InternalOptions):353 -> a
-    32:32:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):396 -> a
-    33:33:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):396:396 -> a
-    34:34:void setNonNullParamOnNormalExits(java.util.BitSet):412:412 -> a
-    35:35:void setSimpleInliningConstraint(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):420:420 -> a
-    36:36:void setInstanceInitializerInfoCollection(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):425:425 -> a
-    37:37:void markInitializesClassesOnNormalExit(java.util.Set):433:433 -> a
-    38:40:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):455:457 -> a
-    41:50:void markReturnsObjectWithUpperBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):465:474 -> a
-    51:56:void markReturnsObjectWithUpperBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):473:478 -> a
-    57:61:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeElement):483:487 -> a
-    62:65:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeElement):486:489 -> a
-    66:66:void markCheckNullReceiverBeforeAnySideEffect(boolean):514:514 -> a
-    67:72:void adjustOptimizationInfoAfterRemovingThisParameter(com.android.tools.r8.graph.AppView):552:557 -> a
-    73:103:void adjustOptimizationInfoAfterRemovingThisParameter(com.android.tools.r8.graph.AppView):556:586 -> a
-    104:104:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.markCheckNullReceiverBeforeAnySideEffect(boolean):514:514 -> a
-    104:104:void adjustOptimizationInfoAfterRemovingThisParameter(com.android.tools.r8.graph.AppView):586 -> a
-    105:105:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.markTriggerClassInitBeforeAnySideEffect(boolean):518:518 -> a
-    105:105:void adjustOptimizationInfoAfterRemovingThisParameter(com.android.tools.r8.graph.AppView):589 -> a
+    28:28:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getInstanceInitializerInfo(com.android.tools.r8.ir.code.InvokeDirect):290:290 -> a
+    29:29:void setBridgeInfo(com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):339:339 -> a
+    30:30:boolean com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.mayHaveSideEffects():392:392 -> a
+    30:30:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):397 -> a
+    31:31:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.getNopInliningConstraint(com.android.tools.r8.utils.InternalOptions):356:356 -> a
+    31:31:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):400 -> a
+    32:32:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.getSimpleInliningConstraint():362:362 -> a
+    32:32:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.getNopInliningConstraint(com.android.tools.r8.utils.InternalOptions):357 -> a
+    32:32:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):400 -> a
+    33:33:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):400:400 -> a
+    34:34:void setNonNullParamOnNormalExits(java.util.BitSet):416:416 -> a
+    35:35:void setSimpleInliningConstraint(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):424:424 -> a
+    36:36:void setInstanceInitializerInfoCollection(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):429:429 -> a
+    37:37:void markInitializesClassesOnNormalExit(java.util.Set):437:437 -> a
+    38:40:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):459:461 -> a
+    41:50:void markReturnsObjectWithUpperBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):469:478 -> a
+    51:56:void markReturnsObjectWithUpperBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):477:482 -> a
+    57:61:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeElement):487:491 -> a
+    62:65:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeElement):490:493 -> a
+    66:66:void markCheckNullReceiverBeforeAnySideEffect(boolean):518:518 -> a
+    67:72:void adjustOptimizationInfoAfterRemovingThisParameter(com.android.tools.r8.graph.AppView):556:561 -> a
+    73:103:void adjustOptimizationInfoAfterRemovingThisParameter(com.android.tools.r8.graph.AppView):560:590 -> a
+    104:104:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.markCheckNullReceiverBeforeAnySideEffect(boolean):518:518 -> a
+    104:104:void adjustOptimizationInfoAfterRemovingThisParameter(com.android.tools.r8.graph.AppView):590 -> a
+    105:105:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.markTriggerClassInitBeforeAnySideEffect(boolean):522:522 -> a
+    105:105:void adjustOptimizationInfoAfterRemovingThisParameter(com.android.tools.r8.graph.AppView):593 -> a
     106:106:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection.empty():22:22 -> a
-    106:106:void adjustOptimizationInfoAfterRemovingThisParameter(com.android.tools.r8.graph.AppView):592 -> a
-    107:120:void adjustOptimizationInfoAfterRemovingThisParameter(com.android.tools.r8.graph.AppView):592:605 -> a
+    106:106:void adjustOptimizationInfoAfterRemovingThisParameter(com.android.tools.r8.graph.AppView):596 -> a
+    107:120:void adjustOptimizationInfoAfterRemovingThisParameter(com.android.tools.r8.graph.AppView):596:609 -> a
     com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo toMutableOptimizationInfo() -> b
     1:1:boolean isFlagSet(int):216:216 -> b
-    2:2:void setNonNullParamOrThrow(java.util.BitSet):408:408 -> b
-    3:3:void markTriggerClassInitBeforeAnySideEffect(boolean):518:518 -> b
-    1:1:void setReachabilitySensitive(boolean):416:416 -> c
-    2:4:void markReturnsArgument(int):437:439 -> c
+    2:2:void setNonNullParamOrThrow(java.util.BitSet):412:412 -> b
+    3:3:void markTriggerClassInitBeforeAnySideEffect(boolean):522:522 -> b
+    1:1:void setReachabilitySensitive(boolean):420:420 -> c
+    2:4:void markReturnsArgument(int):441:443 -> c
     boolean isMutableOptimizationInfo() -> d
     1:1:void setFlag(int):208:208 -> d
     1:1:boolean cannotBeKept():221:221 -> e
-    1:1:boolean checksNullReceiverBeforeAnySideEffect():378:378 -> f
+    1:1:boolean checksNullReceiverBeforeAnySideEffect():382:382 -> f
     1:1:boolean classInitializerMayBePostponed():231:231 -> g
-    1:1:boolean forceInline():368:368 -> h
-    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValue():344:344 -> i
-    1:1:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo getBridgeInfo():331:331 -> j
+    1:1:boolean forceInline():372:372 -> h
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValue():348:348 -> i
+    1:1:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo getBridgeInfo():335:335 -> j
     1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint getClassInlinerMethodConstraint():240:240 -> k
-    1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitiveInstanceInitializerInfo():281:281 -> l
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType():271:271 -> m
-    1:1:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType():266:266 -> n
+    1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitiveInstanceInitializerInfo():285:285 -> l
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType():275:275 -> m
+    1:1:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType():270:270 -> n
     1:1:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification getEnumUnboxerMethodClassification():253:253 -> o
-    1:1:java.util.Set getInitializedClassesOnNormalExit():276:276 -> p
-    1:1:java.util.BitSet getNonNullParamOnNormalExits():296:296 -> q
-    1:1:java.util.BitSet getNonNullParamOrThrow():291:291 -> r
-    1:2:int getReturnedArgument():320:321 -> s
-    1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint getSimpleInliningConstraint():358:358 -> t
-    1:1:boolean isInitializerEnablingJavaVmAssertions():363:363 -> u
-    1:1:boolean isReachabilitySensitive():310:310 -> v
-    1:1:boolean mayHaveSideEffects():388:388 -> w
-    1:1:boolean neverInline():373:373 -> x
-    1:1:boolean neverReturnsNormally():326:326 -> y
-    1:1:boolean returnValueHasBeenPropagated():528:528 -> z
-com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.internal.sd1:
+    1:1:java.util.Set getInitializedClassesOnNormalExit():280:280 -> p
+    1:1:java.util.BitSet getNonNullParamOnNormalExits():300:300 -> q
+    1:1:java.util.BitSet getNonNullParamOrThrow():295:295 -> r
+    1:2:int getReturnedArgument():324:325 -> s
+    1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint getSimpleInliningConstraint():362:362 -> t
+    1:1:boolean isInitializerEnablingJavaVmAssertions():367:367 -> u
+    1:1:boolean isReachabilitySensitive():314:314 -> v
+    1:1:boolean mayHaveSideEffects():392:392 -> w
+    1:1:boolean neverInline():377:377 -> x
+    1:1:boolean neverReturnsNormally():330:330 -> y
+    1:1:boolean returnValueHasBeenPropagated():532:532 -> z
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.internal.vd1:
     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
@@ -91105,13 +91215,13 @@ com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod) -> e
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod) -> f
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.setInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.DexEncodedMethod) -> g
-com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.internal.rd1:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.internal.ud1:
     void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo) -> a
     void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo) -> a
     1:3:void fixup(com.android.tools.r8.graph.DexEncodedMember):30:32 -> a
     4:4:void lambda$fixup$0(com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo,com.android.tools.r8.graph.DexEncodedField):33:33 -> a
     5:5:void lambda$fixup$1(com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo,com.android.tools.r8.graph.DexEncodedMethod):34:34 -> a
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.internal.td1:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.internal.wd1:
     java.util.Map fieldOptimizationInfos -> b
     java.util.Map methodOptimizationInfos -> c
     java.util.Map processed -> d
@@ -91140,23 +91250,23 @@ com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android
     37:37:void setBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):257:257 -> a
     38:39:void setClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint):263:264 -> a
     40:41:void setEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):270:271 -> a
-    42:43:void setInstanceInitializerInfoCollection(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):278:279 -> a
-    44:44:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):294:294 -> a
-    45:45:void setSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):300:300 -> a
-    46:46:void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):305:305 -> a
+    42:43:void setInstanceInitializerInfoCollection(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):283:284 -> a
+    44:44:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):299:299 -> a
+    45:45:void setSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):305:305 -> a
+    46:46:void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):310:310 -> a
     1:3:void updateVisibleOptimizationInfo():91:91 -> b
     5:17:void updateVisibleOptimizationInfo():93:105 -> b
     18:18:boolean lambda$updateVisibleOptimizationInfo$1(java.util.Map$Entry):93:93 -> b
     19:19:void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField):122:122 -> b
     20:20:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):173:173 -> b
     21:21:void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):252:252 -> b
-    22:22:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):289:289 -> b
+    22:22:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):294:294 -> b
     1:6:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getFieldOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedField):46:51 -> c
     7:7:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):178:178 -> c
     1:1:void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod):225:225 -> d
     1:1:void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod):220:220 -> e
     1:1:void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod):230:230 -> f
-    1:1:void setInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.DexEncodedMethod):284:284 -> g
+    1:1:void setInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.DexEncodedMethod):289:289 -> g
     1:6:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedMethod):57:62 -> h
 com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore -> com.android.tools.r8.ir.optimize.info.b:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore INSTANCE -> a
@@ -91193,7 +91303,7 @@ com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore -> com.android.
     void setInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.DexEncodedMethod) -> g
 com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore$1 -> com.android.tools.r8.ir.optimize.info.a:
     1:1:void <init>():27:27 -> <init>
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.internal.ud1:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.internal.xd1:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple INSTANCE -> a
     1:1:void <clinit>():27:27 -> <clinit>
     1:1:void <init>():29:29 -> <init>
@@ -91204,7 +91314,6 @@ com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.
     void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
     void methodReturnsObjectWithLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.type.ClassTypeElement) -> a
     void setClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint) -> a
-    void setEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification) -> a
     1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple getInstance():32:32 -> a
     2:2:void markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField):49:49 -> a
     3:4:void recordFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):70:71 -> a
@@ -91214,28 +91323,30 @@ com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.
     8:8:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):148:148 -> a
     9:9:void setBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):163:163 -> a
     10:14:void unsetClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod):179:183 -> a
-    15:16:void setInstanceInitializerInfoCollection(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):198:199 -> a
-    17:17:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):214:214 -> a
-    18:18:void setSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):220:220 -> a
-    19:19:void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):225:225 -> a
+    15:17:void setEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):191:193 -> a
+    18:19:void setInstanceInitializerInfoCollection(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):206:207 -> a
+    20:20:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):222:222 -> a
+    21:21:void setSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):228:228 -> a
+    22:22:void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):233:233 -> a
     void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> b
     1:1:void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField):39:39 -> b
     2:2:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):84:84 -> b
-    3:3:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):209:209 -> b
+    3:3:void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod):198:198 -> b
+    4:4:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):217:217 -> b
     1:1:void markFieldAsDead(com.android.tools.r8.graph.DexEncodedField):44:44 -> c
     2:2:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):89:89 -> c
     1:1:void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod):128:128 -> d
     void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod) -> e
     void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod) -> f
-    1:1:void setInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.DexEncodedMethod):204:204 -> g
+    1:1:void setInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.DexEncodedMethod):212:212 -> g
     1:1:void unsetAbstractReturnValue(com.android.tools.r8.graph.DexEncodedMethod):111:111 -> h
     1:2:void unsetBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod):167:168 -> i
-com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo -> com.android.tools.r8.internal.Pq1:
+com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo -> com.android.tools.r8.internal.Hq1:
     com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo INSTANCE -> b
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():11:11 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo getInstance():14:14 -> f
-com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer -> com.android.tools.r8.internal.wC0:
+com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer -> com.android.tools.r8.internal.zC0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:51:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):27:77 -> a
@@ -91259,13 +91370,13 @@ com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer -> com.android.tools
     100:100:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):95 -> a
     101:101:boolean com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer.analyzeCheckCastAfterInvoke(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):148:148 -> a
     101:101:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):95 -> a
-com.android.tools.r8.ir.optimize.info.bridge.VirtualBridgeInfo -> com.android.tools.r8.internal.lt1:
+com.android.tools.r8.ir.optimize.info.bridge.VirtualBridgeInfo -> com.android.tools.r8.internal.et1:
     com.android.tools.r8.graph.DexMethod invokedMethod -> a
     1:1:void com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo.<init>():10:10 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod):32 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexMethod):33:33 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():37:37 -> a
-com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.cN0:
+com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.fN0:
     com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection INSTANCE -> a
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():24:24 -> <init>
@@ -91276,7 +91387,7 @@ com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfo
     boolean isEmpty() -> b
     1:1:com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection getInstance():27:27 -> c
     1:1:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo -> com.android.tools.r8.internal.WT0:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo -> com.android.tools.r8.internal.ZT0:
     int argumentIndex -> a
     1:2:void <init>(int):20:21 -> <init>
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
@@ -91284,14 +91395,14 @@ com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationI
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo asArgumentInitializationInfo() -> f
     boolean isArgumentInitializationInfo() -> h
     1:1:java.lang.String toString():49:49 -> toString
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo -> com.android.tools.r8.internal.XT0:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo -> com.android.tools.r8.internal.aU0:
     boolean isTypeInitializationInfo() -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo asArgumentInitializationInfo() -> f
     boolean isSingleValue() -> g
     boolean isArgumentInitializationInfo() -> h
     com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> j
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.ZT0:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.cU0:
     1:1:void <init>():23:23 -> <init>
     void forEach(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer) -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo get(com.android.tools.r8.graph.DexEncodedField) -> a
@@ -91299,19 +91410,19 @@ com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoColle
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder builder():26:26 -> a
     void forEachWithDeterministicOrder(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer) -> b
     boolean isEmpty() -> b
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder -> com.android.tools.r8.internal.YT0:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder -> com.android.tools.r8.internal.bU0:
     java.util.TreeMap infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():44:44 -> <clinit>
     1:3:void <init>():44:46 -> <init>
     1:2:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder recordInitializationInfo(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):54:55 -> a
     3:6:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection build():60:63 -> a
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory -> com.android.tools.r8.internal.aU0:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory -> com.android.tools.r8.internal.dU0:
     java.util.concurrent.ConcurrentHashMap argumentInitializationInfos -> a
     1:3:void <init>():11:13 -> <init>
     1:3:com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo createArgumentInitializationInfo(int):18:18 -> a
     4:4:com.android.tools.r8.ir.optimize.info.field.InstanceFieldTypeInitializationInfo createTypeInitializationInfo(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.analysis.type.TypeElement):24:24 -> a
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldTypeInitializationInfo -> com.android.tools.r8.internal.cU0:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldTypeInitializationInfo -> com.android.tools.r8.internal.fU0:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement dynamicLowerBoundType -> a
     com.android.tools.r8.ir.analysis.type.TypeElement dynamicUpperBoundType -> b
     1:3:void <init>(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.analysis.type.TypeElement):26:28 -> <init>
@@ -91326,7 +91437,7 @@ com.android.tools.r8.ir.optimize.info.field.InstanceFieldTypeInitializationInfo
     1:6:boolean equals(java.lang.Object):80:85 -> equals
     1:1:int hashCode():72:72 -> hashCode
     1:1:java.lang.String toString():90:90 -> toString
-com.android.tools.r8.ir.optimize.info.field.NonTrivialInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.ra1:
+com.android.tools.r8.ir.optimize.info.field.NonTrivialInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.ua1:
     java.util.TreeMap infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():22:22 -> <clinit>
@@ -91342,14 +91453,14 @@ com.android.tools.r8.ir.optimize.info.field.NonTrivialInstanceFieldInitializatio
     boolean isEmpty() -> b
     1:1:void forEachWithDeterministicOrder(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer):55:55 -> b
     1:4:java.lang.String toString():86:89 -> toString
-com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo -> com.android.tools.r8.internal.Xr1:
+com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo -> com.android.tools.r8.internal.Pr1:
     com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo INSTANCE -> a
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():20:20 -> <init>
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo getInstance():23:23 -> b
     1:1:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection -> com.android.tools.r8.internal.MJ0:
+com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection -> com.android.tools.r8.internal.PJ0:
     com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo info -> a
     1:2:void <init>(com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo):18:19 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection.get(com.android.tools.r8.ir.code.InvokeDirect):29:29 -> a
@@ -91358,7 +91469,7 @@ com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInit
     2:5:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):13 -> a
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection.getContextInsensitive():24:24 -> b
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive():13 -> b
-com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.internal.tK0:
+com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.internal.wK0:
     com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo INSTANCE -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>():22:22 -> <init>
@@ -91370,7 +91481,7 @@ com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo
     boolean receiverNeverEscapesOutsideConstructorChain() -> h
     1:1:com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo getInstance():25:25 -> i
     1:1:java.lang.String toString():76:76 -> toString
-com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection -> com.android.tools.r8.internal.dN0:
+com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection -> com.android.tools.r8.internal.gN0:
     com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection EMPTY -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -91380,7 +91491,7 @@ com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCo
     1:1:com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection.getContextInsensitive():26:26 -> b
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive():13 -> b
     1:1:com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection getInstance():21:21 -> c
-com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo -> com.android.tools.r8.internal.iU0:
+com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo -> com.android.tools.r8.internal.lU0:
     1:1:void <init>():15:15 -> <init>
     com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo asNonTrivialInstanceInitializerInfo() -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fieldInitializationInfos() -> b
@@ -91390,7 +91501,7 @@ com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo -> com
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet() -> f
     1:1:boolean receiverMayEscapeOutsideConstructorChain():71:71 -> g
     boolean receiverNeverEscapesOutsideConstructorChain() -> h
-com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection -> com.android.tools.r8.internal.jU0:
+com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection -> com.android.tools.r8.internal.mU0:
     1:1:void <init>():15:15 -> <init>
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo get(com.android.tools.r8.ir.code.InvokeDirect) -> a
     1:1:boolean com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo.isNonTrivialInstanceInitializerInfo():0:0 -> a
@@ -91401,7 +91512,7 @@ com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollect
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems) -> a
     5:5:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection empty():22:22 -> a
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive() -> b
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo -> com.android.tools.r8.internal.ua1:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo -> com.android.tools.r8.internal.xa1:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fieldInitializationInfos -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet -> c
@@ -91423,8 +91534,8 @@ com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerI
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet():83:83 -> f
     1:1:boolean receiverNeverEscapesOutsideConstructorChain():98:98 -> h
     1:1:java.lang.String toString():113:113 -> toString
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$1 -> com.android.tools.r8.internal.sa1:
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder -> com.android.tools.r8.internal.ta1:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$1 -> com.android.tools.r8.internal.va1:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder -> com.android.tools.r8.internal.wa1:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection instanceFieldInitializationInfos -> a
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet -> c
@@ -91481,7 +91592,7 @@ com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerI
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setInstanceFieldInitializationMayDependOnEnvironment():186:186 -> f
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setMayHaveOtherSideEffectsThanInstanceFieldAssignments():195:195 -> g
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setReceiverMayEscapeOutsideConstructorChain():200:200 -> h
-com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.internal.sK0:
+com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.internal.vK0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.CallSiteInformation callSiteInformation -> b
     com.android.tools.r8.ir.optimize.Inliner inliner -> c
@@ -91496,10 +91607,10 @@ com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.an
     28:30:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):57 -> a
     31:33:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):58:60 -> a
     34:35:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):40:41 -> a
-com.android.tools.r8.ir.optimize.inliner.FixedInliningReasonStrategy -> com.android.tools.r8.internal.pP0:
+com.android.tools.r8.ir.optimize.inliner.FixedInliningReasonStrategy -> com.android.tools.r8.internal.sP0:
     1:1:void <init>(com.android.tools.r8.ir.optimize.Inliner$Reason):15:15 -> <init>
     1:1:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):22:22 -> a
-com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.internal.LT0:
+com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.internal.OT0:
     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
@@ -91508,7 +91619,7 @@ com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.in
     7:7:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):33 -> a
     8:8:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):36:36 -> a
     9:9:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):34:34 -> a
-com.android.tools.r8.ir.optimize.inliner.InliningIRProvider -> com.android.tools.r8.internal.MT0:
+com.android.tools.r8.ir.optimize.inliner.InliningIRProvider -> com.android.tools.r8.internal.PT0:
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> d
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> f
@@ -91524,14 +91635,14 @@ com.android.tools.r8.ir.optimize.inliner.InliningIRProvider -> com.android.tools
     4:4:com.android.tools.r8.ir.conversion.MethodProcessor getMethodProcessor():64:64 -> a
     5:5:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):73:73 -> a
     1:13:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):37:49 -> b
-    14:17:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.ir.conversion.IRBuilder.lookupPrototypeChangesForInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):461:464 -> b
+    14:17:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.ir.conversion.IRBuilder.lookupPrototypeChangesForInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):463:466 -> b
     14:17:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):49 -> b
     18:19:com.android.tools.r8.ir.code.IRCode com.android.tools.r8.graph.ProgramMethod.buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.RewrittenPrototypeDescription):36:37 -> b
     18:19:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):43 -> b
     20:20:boolean verifyIRCacheIsEmpty():68:68 -> b
-com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.internal.OT0:
+com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.internal.RT0:
     com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> a
-com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.internal.wa1:
+com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.internal.za1:
     com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -91570,7 +91681,7 @@ com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.
     void reportUnknownTarget() -> x
     boolean unsetReasonHasBeenReportedFlag() -> y
     1:1:com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter getInstance():21:21 -> z
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.internal.At1:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.internal.tt1:
     1:1:void <init>():18:18 -> <init>
     void reportCallerNotSameClass() -> a
     void reportIncorrectArity(int,int) -> a
@@ -91608,7 +91719,7 @@ com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.and
     void reportRecursiveMethod() -> w
     void reportUnknownTarget() -> x
     boolean unsetReasonHasBeenReportedFlag() -> y
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.internal.Bt1:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.internal.ut1:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.ProgramMethod context -> b
     com.android.tools.r8.graph.ProgramMethod callee -> a
@@ -91653,7 +91764,7 @@ com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com
     1:1:void reportRecursiveMethod():214:214 -> w
     1:1:void reportUnknownTarget():219:219 -> x
     1:2:boolean unsetReasonHasBeenReportedFlag():275:276 -> y
-com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer -> com.android.tools.r8.internal.ZB0:
+com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer -> com.android.tools.r8.internal.cC0:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView):27:29 -> <init>
@@ -91682,7 +91793,7 @@ com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer -> com.android.t
     31:37:void com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer.optimizeValueOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):97:97 -> a
     31:37:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):49 -> a
     1:1:com.android.tools.r8.graph.DexType getType():34:34 -> getType
-com.android.tools.r8.ir.optimize.library.ByteMethodOptimizer -> com.android.tools.r8.internal.CC0:
+com.android.tools.r8.ir.optimize.library.ByteMethodOptimizer -> com.android.tools.r8.internal.FC0:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView):23:25 -> <init>
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):40:40 -> a
@@ -91697,7 +91808,7 @@ com.android.tools.r8.ir.optimize.library.ByteMethodOptimizer -> com.android.tool
     10:11:void com.android.tools.r8.ir.optimize.library.ByteMethodOptimizer.optimizeByteValue(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):53:54 -> a
     10:11:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):41 -> a
     1:1:com.android.tools.r8.graph.DexType getType():30:30 -> getType
-com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer -> com.android.tools.r8.internal.FN0:
+com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer -> com.android.tools.r8.internal.IN0:
     com.android.tools.r8.graph.AppView appView -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):26:27 -> <init>
     1:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):42:43 -> a
@@ -91709,18 +91820,17 @@ com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer -> com.android.tool
     26:27:void com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer.insertAssumeDynamicType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):75:76 -> a
     26:27:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):44 -> a
     1:1:com.android.tools.r8.graph.DexType getType():32:32 -> getType
-com.android.tools.r8.ir.optimize.library.LibraryFieldSynthesis -> com.android.tools.r8.internal.A41:
-    1:3:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):29:31 -> a
+com.android.tools.r8.ir.optimize.library.LibraryFieldSynthesis -> com.android.tools.r8.internal.D41:
+    1:3:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):27:29 -> a
     4:4:com.android.tools.r8.graph.DexLibraryClass com.android.tools.r8.graph.DexLibraryClass.asLibraryClassOrNull(com.android.tools.r8.graph.DexClass):78:78 -> a
-    4:4:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):31 -> a
-    5:5:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):33:33 -> a
+    4:4:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):29 -> a
+    5:5:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):31:31 -> a
     6:7:void com.android.tools.r8.graph.DexItemFactory$EnumMembers.forEachField(java.util.function.Consumer):1640:1641 -> a
-    6:7:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):33 -> a
-    8:16:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexField):35:43 -> a
-    17:17:void com.android.tools.r8.graph.DexEncodedField.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):69:69 -> a
-    17:17:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexField):43 -> a
-    18:18:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexField):37:37 -> a
-com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer -> com.android.tools.r8.internal.C41:
+    6:7:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):31 -> a
+    8:14:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexField):33:39 -> a
+    15:18:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexField):38:41 -> a
+    19:19:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexField):35:35 -> a
+com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer -> com.android.tools.r8.internal.F41:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map libraryMethodModelCollections -> d
     java.util.Set modeledLibraryTypes -> c
@@ -91734,7 +91844,7 @@ com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer -> com.android.t
     4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
     4:4:void lambda$initializeFinalLibraryFields$0(com.android.tools.r8.graph.DexField):70 -> a
     5:5:void lambda$initializeFinalLibraryFields$0(com.android.tools.r8.graph.DexField):70:70 -> a
-    6:6:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():237:237 -> a
+    6:6:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():203:203 -> a
     6:6:void lambda$initializeFinalLibraryFields$0(com.android.tools.r8.graph.DexField):72 -> a
     7:9:void lambda$initializeFinalLibraryFields$0(com.android.tools.r8.graph.DexField):73:75 -> a
     10:10:boolean isFinalLibraryField(com.android.tools.r8.graph.DexEncodedField):84:84 -> a
@@ -91754,11 +91864,11 @@ com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer -> com.android.t
     52:52:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):161 -> a
     53:53:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):161:161 -> a
     54:54:com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State lambda$optimize$1(com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection):150:150 -> a
-com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.internal.E41:
+com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.internal.H41:
     com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State createInitialState(com.android.tools.r8.ir.conversion.MethodProcessor) -> a
     void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
-com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State -> com.android.tools.r8.internal.D41:
-com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection -> com.android.tools.r8.internal.I41:
+com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State -> com.android.tools.r8.internal.G41:
+com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection -> com.android.tools.r8.internal.L41:
     java.util.Map finalMethodsWithoutSideEffects -> a
     java.util.Set nonFinalMethodsWithoutSideEffects -> c
     java.util.Set unconditionalFinalMethodsWithoutSideEffects -> b
@@ -91780,7 +91890,7 @@ com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection
     2:2:boolean lambda$buildFinalMethodsWithoutSideEffects$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.util.List):56:56 -> b
     3:28:java.util.Set buildUnconditionalFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.DexItemFactory):71:96 -> b
     1:1:boolean lambda$buildFinalMethodsWithoutSideEffects$2(com.android.tools.r8.graph.DexMethod,java.util.List):52:52 -> c
-com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer -> com.android.tools.r8.internal.K41:
+com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer -> com.android.tools.r8.internal.N41:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory -> a
@@ -91822,7 +91932,7 @@ com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer -> c
     39:39:void run(java.util.Set):47 -> a
     40:40:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelStaticFinalLibraryFields(java.util.Set):94:94 -> a
     40:40:void run(java.util.Set):48 -> a
-    41:41:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> a
+    41:41:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> a
     41:41:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelStaticFinalLibraryFields(java.util.Set):95 -> a
     41:41:void run(java.util.Set):48 -> a
     42:44:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelStaticFinalLibraryFields(java.util.Set):96:98 -> a
@@ -91865,7 +91975,7 @@ com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer -> c
     3:3:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):176 -> b
     4:6:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):177:179 -> b
     1:3:void modelLibraryMethodsWithoutSideEffects():155:157 -> c
-com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools.r8.internal.G51:
+com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools.r8.internal.J51:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.graph.DexMethod wtfMethod -> j
     com.android.tools.r8.graph.DexMethod eMethod -> i
@@ -91887,14 +91997,14 @@ com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools
     4:38:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):109:143 -> a
     39:42:void replaceInvokeWithConstNumber(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,int):150:153 -> a
     1:1:com.android.tools.r8.graph.DexType getType():99:99 -> getType
-com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer -> com.android.tools.r8.internal.Tc1:
+com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer -> com.android.tools.r8.internal.Wc1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):21:22 -> <init>
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):37:37 -> a
     2:4:void com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer.optimizeGetClass(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):43:45 -> a
     2:4:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):38 -> a
     1:1:com.android.tools.r8.graph.DexType getType():27:27 -> getType
-com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer -> com.android.tools.r8.internal.id1:
+com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer -> com.android.tools.r8.internal.ld1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.utils.InternalOptions options -> e
@@ -91986,7 +92096,7 @@ com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer -> com.android.t
     126:126:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):111:111 -> a
     126:126:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):55 -> a
     1:1:com.android.tools.r8.graph.DexType getType():41:41 -> getType
-com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection -> com.android.tools.r8.internal.oo1:
+com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection -> com.android.tools.r8.internal.go1:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -91995,7 +92105,7 @@ com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection -
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):17:17 -> a
     2:2:void com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):42:42 -> a
     2:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):17 -> a
-com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer -> com.android.tools.r8.internal.Oo1:
+com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer -> com.android.tools.r8.internal.Go1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -92098,7 +92208,7 @@ com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer -> com.and
     82:82:com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State createInitialState(com.android.tools.r8.ir.conversion.MethodProcessor):42 -> a
     1:1:com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods access$100(com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer):42:42 -> b
     1:1:com.android.tools.r8.graph.DexType getType():64:64 -> getType
-com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State -> com.android.tools.r8.internal.No1:
+com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State -> com.android.tools.r8.internal.Fo1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap unusedBuilders -> b
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> a
     com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer this$0 -> c
@@ -92123,7 +92233,7 @@ com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State -> c
     155:155:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):176:176 -> a
     156:156:void lambda$computeIsUnusedBuilder$0(boolean,com.android.tools.r8.ir.code.Value):176:176 -> a
     1:5:boolean isUnusedBuilder(com.android.tools.r8.ir.code.Value):164:168 -> b
-com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.tools.r8.internal.Uo1:
+com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.tools.r8.internal.Mo1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView):30:32 -> <init>
@@ -92144,7 +92254,7 @@ com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.to
     53:53:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):124 -> a
     54:56:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):124:126 -> a
     1:1:com.android.tools.r8.graph.DexType getType():37:37 -> getType
-com.android.tools.r8.ir.optimize.library.sideeffects.JavaLangObjectsSideEffectCollection -> com.android.tools.r8.internal.HY0:
+com.android.tools.r8.ir.optimize.library.sideeffects.JavaLangObjectsSideEffectCollection -> com.android.tools.r8.internal.KY0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:12:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):22:33 -> a
@@ -92154,7 +92264,7 @@ com.android.tools.r8.ir.optimize.library.sideeffects.JavaLangObjectsSideEffectCo
     21:21:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexMethod):639:639 -> a
     21:21:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):44 -> a
     22:27:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):49:54 -> a
-com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo -> com.android.tools.r8.internal.mA0:
+com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo -> com.android.tools.r8.internal.pA0:
     com.android.tools.r8.shaking.ProguardMemberRule rule -> b
     com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$AssumeType type -> a
     1:3:void <init>(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$AssumeType,com.android.tools.r8.shaking.ProguardMemberRule):26:28 -> <init>
@@ -92165,10 +92275,10 @@ com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo -> com
     1:1:boolean isAssumeValues():44:44 -> d
     1:5:boolean equals(java.lang.Object):56:60 -> equals
     1:1:int hashCode():65:65 -> hashCode
-com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfoLookup -> com.android.tools.r8.internal.nA0:
+com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfoLookup -> com.android.tools.r8.internal.qA0:
     1:8:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClassAndMethod):22:29 -> a
     9:23:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMember):35:49 -> a
-com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.internal.jB0:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.internal.mB0:
     1:1:java.util.List com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher.nonDestructivePeepholes():23:23 -> a
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):39 -> a
     2:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):39:39 -> a
@@ -92186,10 +92296,10 @@ com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tool
     43:45:void runPeepholes(com.android.tools.r8.ir.code.IRCode,java.util.List,com.android.tools.r8.utils.InternalOptions):79 -> a
     46:46:java.lang.Object com.android.tools.r8.ir.code.BasicBlockIterator.next():10:10 -> a
     46:46:void runPeepholes(com.android.tools.r8.ir.code.IRCode,java.util.List,com.android.tools.r8.utils.InternalOptions):81 -> a
-com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.internal.kB0:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.internal.nB0:
     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.internal.SM0:
+com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tools.r8.internal.VM0:
     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
@@ -92213,7 +92323,7 @@ com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tool
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDup():0:0 -> c
     2:2:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):35 -> c
     3:3: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.internal.v51:
+com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.tools.r8.internal.y51:
     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
@@ -92224,10 +92334,10 @@ com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.to
     1:24:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):41:64 -> a
     25:25:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> a
     25:25:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):64 -> a
-com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.internal.L61:
+com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.internal.O61:
     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.internal.D81:
+com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.internal.G81:
     com.android.tools.r8.ir.optimize.peepholes.Point firstLoad -> d
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> e
     com.android.tools.r8.ir.code.Instruction insertPosition -> c
@@ -92260,12 +92370,12 @@ com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.too
     12:12:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> b
     12:12:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):59 -> b
     13:13:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):60:60 -> b
-com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.internal.me1:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.internal.pe1:
     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.internal.ne1:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.internal.qe1:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:java.util.function.Predicate withoutLocalInfo(java.util.function.Predicate):17:17 -> a
@@ -92276,7 +92386,7 @@ com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r
     23:23:boolean lambda$moveInstructionsUpToCurrentPosition$1(java.util.List,com.android.tools.r8.ir.code.Instruction):66:66 -> a
     1:4:int numberOfValuesPutOnStack(com.android.tools.r8.ir.code.Instruction):38:41 -> b
     5:5:boolean lambda$moveInstructionsUpToCurrentPosition$2(java.util.List,com.android.tools.r8.ir.code.Instruction):72:72 -> b
-com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.internal.oe1:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.internal.re1:
     com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[] expressions -> b
     java.util.List instructions -> a
     boolean backwards -> c
@@ -92285,7 +92395,7 @@ com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r
     2:5:com.android.tools.r8.ir.optimize.peepholes.Match test(com.android.tools.r8.ir.code.InstructionListIterator):37:40 -> a
     6:42:com.android.tools.r8.ir.optimize.peepholes.Match testDirection(java.util.function.Supplier,java.util.function.Supplier,java.lang.Runnable):48:84 -> a
     1:1:com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout lookForward(com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[]):29:29 -> b
-com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.internal.xe1:
+com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.internal.Ae1:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -92297,7 +92407,7 @@ com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.interna
     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.RemoveDebugPositionPeephole -> com.android.tools.r8.internal.Tk1:
+com.android.tools.r8.ir.optimize.peepholes.RemoveDebugPositionPeephole -> com.android.tools.r8.internal.Rk1:
     com.android.tools.r8.ir.optimize.peepholes.Point secondInstructionExp -> b
     com.android.tools.r8.ir.optimize.peepholes.Point debugPositionExp -> a
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> c
@@ -92307,14 +92417,14 @@ com.android.tools.r8.ir.optimize.peepholes.RemoveDebugPositionPeephole -> com.an
     boolean lambda$match$0(com.android.tools.r8.ir.code.DebugPosition,com.android.tools.r8.ir.code.Instruction) -> a
     boolean resetAfterMatch() -> a
     1:33:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):52:84 -> a
-com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.internal.Co1:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.internal.uo1:
     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.internal.Do1:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.internal.vo1:
     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
@@ -92333,7 +92443,7 @@ com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.an
     24:24:boolean com.android.tools.r8.ir.code.Instruction.isDup():0:0 -> a
     24:24:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):62 -> a
     25:43:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):62:80 -> a
-com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.internal.Eo1:
+com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.internal.wo1:
     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
@@ -92359,7 +92469,7 @@ com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.andr
     3:3:boolean com.android.tools.r8.ir.code.Instruction.isLoad():0:0 -> c
     3:3:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):73 -> c
     4:5:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):74:75 -> c
-com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.internal.Ft1:
+com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.internal.yt1:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -92371,143 +92481,147 @@ com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.inte
     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.internal.sH0:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer -> com.android.tools.r8.internal.vH0:
     com.android.tools.r8.graph.DexItemFactory factory -> b
+    com.android.tools.r8.graph.GraphLens graphLensForOptimizationPass -> d
+    java.util.concurrent.ConcurrentHashMap candidates -> f
     com.android.tools.r8.graph.AppView appView -> a
-    java.util.Map referencedFrom -> d
-    java.util.concurrent.ConcurrentHashMap candidates -> e
-    boolean $assertionsDisabled -> f
+    boolean $assertionsDisabled -> g
+    java.util.Map referencedFrom -> e
     com.android.tools.r8.ir.conversion.IRConverter converter -> c
-    1:1:void <clinit>():55:55 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):110:110 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):104:113 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer):55:55 -> a
-    2:54:void collectCandidates(com.android.tools.r8.graph.DexApplication):120:172 -> a
-    55:57:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):131:133 -> a
-    58:59:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):189:190 -> a
-    58:59:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):135 -> a
-    60:61:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):140:141 -> a
-    62:63:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):189:190 -> a
-    62:63:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):141 -> a
-    64:65:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):145:146 -> a
-    66:67:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):189:190 -> a
-    66:67:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):147 -> a
-    68:68:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():489:489 -> a
-    68:68:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):149 -> a
-    69:69:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):150:150 -> a
-    70:71:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):189:190 -> a
-    70:71:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):150 -> a
-    72:84:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):155:167 -> a
-    85:86:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):189:190 -> a
-    85:86:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):167 -> a
-    87:91:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):173:177 -> a
-    92:97:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):195:200 -> a
-    92:97:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):178 -> a
-    98:101:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):179:182 -> a
-    102:115:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):230:243 -> a
-    116:129:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):240:253 -> a
-    130:133:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):535:538 -> a
-    130:133:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):254 -> a
-    134:134:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    134:134:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):538 -> a
-    134:134:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):254 -> a
-    135:140:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):539:544 -> a
-    135:140:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):254 -> a
-    141:141:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    141:141:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):547 -> a
-    141:141:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):254 -> a
-    142:147:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):547:552 -> a
-    142:147:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):254 -> a
-    148:179:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):256:287 -> a
-    180:188:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):394:402 -> a
-    180:188:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):288 -> a
-    189:189:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.ProgramMethod):85:85 -> a
-    189:189:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):405 -> a
-    189:189:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):288 -> a
-    190:190:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():89:89 -> a
-    190:190:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.ProgramMethod):85 -> a
-    190:190:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):405 -> a
-    190:190:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):288 -> a
-    191:231:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):408:448 -> a
-    191:231:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):288 -> a
-    232:232:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isNonThrowingConstInstruction(com.android.tools.r8.ir.code.Instruction):483:483 -> a
-    232:232:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):448 -> a
-    232:232:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):288 -> a
-    233:248:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):451:466 -> a
-    233:248:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):288 -> a
-    249:255:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidStaticPut(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):518:524 -> a
-    249:255:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):467 -> a
-    249:255:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):288 -> a
-    256:265:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):468:477 -> a
-    256:265:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):288 -> a
-    266:272:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):290:296 -> a
-    273:274:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):385:386 -> a
-    273:274:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):296 -> a
-    275:275:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
-    275:275:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):387 -> a
-    275:275:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):296 -> a
-    276:276:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):388:388 -> a
-    276:276:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):296 -> a
-    277:282:boolean com.android.tools.r8.ir.code.Goto.isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):108:113 -> a
-    277:282:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):388 -> a
-    277:282:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):296 -> a
-    283:283:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):389:389 -> a
-    283:283:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):296 -> a
-    284:301:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):297:314 -> a
-    302:302:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    302:302:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):319 -> a
-    303:303:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):321:321 -> a
-    304:312:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):565:573 -> a
-    304:312:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):321 -> a
-    313:319:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):572:578 -> a
-    313:319:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):321 -> a
-    320:332:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):323:335 -> a
-    333:342:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):586:595 -> a
-    333:342:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):335 -> a
-    343:358:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):337:352 -> a
-    359:359:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> a
-    359:359:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):357 -> a
-    360:361:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):359:360 -> a
-    362:362:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    362:362:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):364 -> a
-    363:368:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):364:369 -> a
-    369:372:void addReferencedFrom(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.graph.ProgramMethod):377:380 -> a
-    373:373:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder lambda$addReferencedFrom$2(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):379:379 -> a
-    374:399:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):488:513 -> a
-    400:400:boolean lambda$isValidInitCall$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):498:498 -> a
-    401:406: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):602:607 -> a
-    407:409: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):606:608 -> a
-    410:413:boolean isSelectedValueUsersValid(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set):618:621 -> a
-    414:414:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):637:637 -> a
-    415:415:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    415:415:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):637 -> a
-    416:447:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):638:669 -> a
-    448:448:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.GraphLens):694:694 -> a
-    1:1:boolean lambda$isValidValueUser$4(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):646:646 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.internal.pH0:
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.internal.qH0:
-    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):697:697 -> <init>
-    2:3:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):699:700 -> <init>
-    1:1:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):725:725 -> a
-    2:2:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):750:750 -> a
-    1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):735:735 -> b
-    1:1:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):730:730 -> c
-    2:2:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):745:745 -> c
-    3:5:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerTypeReference(com.android.tools.r8.graph.DexType):770:772 -> c
-    3:5:void registerInitClass(com.android.tools.r8.graph.DexType):715 -> c
-    1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):740:740 -> d
-    2:4:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerTypeReference(com.android.tools.r8.graph.DexType):770:772 -> d
-    2:4:void registerInstanceOf(com.android.tools.r8.graph.DexType):778 -> d
-    1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):720:720 -> e
-    2:2:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):760:760 -> e
-    3:5:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerTypeReference(com.android.tools.r8.graph.DexType):770:772 -> e
-    3:5:void registerNewInstance(com.android.tools.r8.graph.DexType):755 -> e
-    1:2:void registerMethod(com.android.tools.r8.graph.DexMethod):704:705 -> f
-    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):765:765 -> g
-    2:4:void registerTypeReference(com.android.tools.r8.graph.DexType):770:772 -> g
-    1:2:void registerField(com.android.tools.r8.graph.DexField):709:710 -> i
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.internal.rH0:
+    1:1:void <clinit>():54:54 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):111:111 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):105:114 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer):54:54 -> a
+    2:3:void prepareForPrimaryOptimizationPass(com.android.tools.r8.graph.GraphLens):118:119 -> a
+    4:4:void lambda$prepareForSecondaryOptimizationPass$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder):132:132 -> a
+    5:63:void collectCandidates():140:198 -> a
+    64:66:void lambda$collectCandidates$1(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):154:156 -> a
+    67:68:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):218:219 -> a
+    67:68:void lambda$collectCandidates$1(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):158 -> a
+    69:70:void lambda$collectCandidates$1(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):163:164 -> a
+    71:72:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):218:219 -> a
+    71:72:void lambda$collectCandidates$1(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):164 -> a
+    73:74:void lambda$collectCandidates$1(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):168:169 -> a
+    75:76:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):218:219 -> a
+    75:76:void lambda$collectCandidates$1(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):170 -> a
+    77:77:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():431:431 -> a
+    77:77:void lambda$collectCandidates$1(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):172 -> a
+    78:78:void lambda$collectCandidates$1(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):173:173 -> a
+    79:80:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):218:219 -> a
+    79:80:void lambda$collectCandidates$1(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):173 -> a
+    81:93:void lambda$collectCandidates$1(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):178:190 -> a
+    94:95:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):218:219 -> a
+    94:95:void lambda$collectCandidates$1(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):190 -> a
+    96:101:void lambda$collectCandidates$2(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):200:205 -> a
+    102:107:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):224:229 -> a
+    102:107:void lambda$collectCandidates$2(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):207 -> a
+    108:111:void lambda$collectCandidates$2(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):208:211 -> a
+    112:125:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):259:272 -> a
+    126:139:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):269:282 -> a
+    140:143:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):568:571 -> a
+    140:143:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):283 -> a
+    144:144:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    144:144:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):571 -> a
+    144:144:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):283 -> a
+    145:150:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):572:577 -> a
+    145:150:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):283 -> a
+    151:151:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    151:151:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):580 -> a
+    151:151:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):283 -> a
+    152:157:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):580:585 -> a
+    152:157:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):283 -> a
+    158:189:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):285:316 -> a
+    190:198:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):427:435 -> a
+    190:198:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):317 -> a
+    199:199:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.ProgramMethod):86:86 -> a
+    199:199:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):438 -> a
+    199:199:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):317 -> a
+    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():90:90 -> a
+    200:200:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.ProgramMethod):86 -> a
+    200:200:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):438 -> a
+    200:200:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):317 -> a
+    201:241:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):441:481 -> a
+    201:241:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):317 -> a
+    242:242:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isNonThrowingConstInstruction(com.android.tools.r8.ir.code.Instruction):516:516 -> a
+    242:242:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):481 -> a
+    242:242:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):317 -> a
+    243:258:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):484:499 -> a
+    243:258:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):317 -> a
+    259:265:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidStaticPut(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):551:557 -> a
+    259:265:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):500 -> a
+    259:265:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):317 -> a
+    266:275:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):501:510 -> a
+    266:275:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):317 -> a
+    276:282:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):319:325 -> a
+    283:284:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):418:419 -> a
+    283:284:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):325 -> a
+    285:285:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
+    285:285:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):420 -> a
+    285:285:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):325 -> a
+    286:286:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):421:421 -> a
+    286:286:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):325 -> a
+    287:292:boolean com.android.tools.r8.ir.code.Goto.isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):108:113 -> a
+    287:292:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):421 -> a
+    287:292:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):325 -> a
+    293:293:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):422:422 -> a
+    293:293:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):325 -> a
+    294:311:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):326:343 -> a
+    312:312:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    312:312:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):348 -> a
+    313:313:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):350:350 -> a
+    314:322:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):598:606 -> a
+    314:322:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):350 -> a
+    323:329:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):605:611 -> a
+    323:329:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):350 -> a
+    330:342:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):352:364 -> a
+    343:352:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):619:628 -> a
+    343:352:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):364 -> a
+    353:368:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):366:381 -> a
+    369:369:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> a
+    369:369:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):386 -> a
+    370:371:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):388:389 -> a
+    372:372:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    372:372:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):393 -> a
+    373:378:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):393:398 -> a
+    379:386:void addReferencedFrom(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.graph.ProgramMethod):406:413 -> a
+    387:387:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder lambda$addReferencedFrom$3(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):412:412 -> a
+    388:413:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):521:546 -> a
+    414:414:boolean lambda$isValidInitCall$4(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):531:531 -> a
+    415:420: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):635:640 -> a
+    421:423: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):639:641 -> a
+    424:427:boolean isSelectedValueUsersValid(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set):651:654 -> a
+    428:428:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):670:670 -> a
+    429:429:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    429:429:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):670 -> a
+    430:461:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):671:702 -> a
+    462:462:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):726:726 -> a
+    1:7:void prepareForSecondaryOptimizationPass(com.android.tools.r8.graph.GraphLens):127:133 -> b
+    8:8:boolean lambda$isValidValueUser$5(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):679:679 -> b
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.internal.sH0:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.internal.tH0:
+    com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer this$0 -> d
+    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):729:729 -> <init>
+    2:3:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):731:732 -> <init>
+    1:1:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):757:757 -> a
+    2:2:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):782:782 -> a
+    1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):767:767 -> b
+    1:1:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):762:762 -> c
+    2:2:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):777:777 -> c
+    3:5:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerTypeReference(com.android.tools.r8.graph.DexType):802:804 -> c
+    3:5:void registerInitClass(com.android.tools.r8.graph.DexType):747 -> c
+    1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):772:772 -> d
+    2:4:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerTypeReference(com.android.tools.r8.graph.DexType):802:804 -> d
+    2:4:void registerInstanceOf(com.android.tools.r8.graph.DexType):810 -> d
+    1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):752:752 -> e
+    2:2:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):792:792 -> e
+    3:5:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerTypeReference(com.android.tools.r8.graph.DexType):802:804 -> e
+    3:5:void registerNewInstance(com.android.tools.r8.graph.DexType):787 -> e
+    1:2:void registerMethod(com.android.tools.r8.graph.DexMethod):736:737 -> f
+    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):797:797 -> g
+    2:4:void registerTypeReference(com.android.tools.r8.graph.DexType):802:804 -> g
+    1:2:void registerField(com.android.tools.r8.graph.DexField):741:742 -> i
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.internal.uH0:
     java.util.concurrent.atomic.AtomicInteger instancesCreated -> e
     com.android.tools.r8.graph.DexEncodedField singletonField -> b
     java.util.concurrent.atomic.AtomicInteger fieldWrites -> d
@@ -92517,244 +92631,243 @@ com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com
     com.android.tools.r8.graph.DexProgramClass candidate -> a
     java.util.concurrent.atomic.AtomicReference constructor -> f
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer this$0 -> h
-    1:1:void <clinit>():63:63 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):74:74 -> <init>
-    2:17:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):66:81 -> <init>
-    1:1:com.android.tools.r8.graph.DexProgramClass hostClass():93:93 -> a
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():89:89 -> a
-    2:2:com.android.tools.r8.graph.DexProgramClass hostClass():93 -> a
-    3:4:com.android.tools.r8.graph.DexProgramClass hostClass():93:94 -> a
-    1:1:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo invalidate():99:99 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLens -> com.android.tools.r8.internal.tH0:
+    1:1:void <clinit>():64:64 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):75:75 -> <init>
+    2:17:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):67:82 -> <init>
+    1:1:com.android.tools.r8.graph.DexProgramClass hostClass():94:94 -> a
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():90:90 -> a
+    2:2:com.android.tools.r8.graph.DexProgramClass hostClass():94 -> a
+    3:4:com.android.tools.r8.graph.DexProgramClass hostClass():94:95 -> a
+    1:1:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo invalidate():100:100 -> b
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLens -> com.android.tools.r8.internal.wH0:
     boolean $assertionsDisabled -> n
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap):20:20 -> <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):25:27 -> b
-com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.internal.Ao1:
-    boolean $assertionsDisabled -> m
+com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.internal.so1:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> b
     com.android.tools.r8.utils.collections.SortedProgramMethodSet methodsToReprocess -> d
+    boolean $assertionsDisabled -> l
     com.android.tools.r8.utils.collections.ProgramMethodSet methodsToBeStaticized -> h
-    com.android.tools.r8.graph.GraphLens applied -> l
-    com.android.tools.r8.utils.collections.ProgramMethodSet referencingExtraMethods -> f
     java.util.Map singletonFields -> i
     java.util.Map singletonGetters -> j
+    com.android.tools.r8.utils.collections.ProgramMethodSet referencingExtraMethods -> f
     java.util.Map candidateToHostMapping -> k
     java.util.Map processingQueue -> e
     com.android.tools.r8.ir.conversion.IRConverter converter -> c
     java.util.Map hostClassInits -> g
-    1:1:void <clinit>():72:72 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.GraphLens):96:96 -> <init>
-    2:24:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.GraphLens):78:100 -> <init>
-    1:1:void lambda$run$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):118:118 -> a
-    2:5:void lambda$run$1(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):122:125 -> a
-    6:6:void lambda$run$2(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):131:131 -> a
-    7:16:java.util.Map finalEligibilityCheck():161:170 -> a
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():89:89 -> a
-    17:17:java.util.Map finalEligibilityCheck():171 -> a
-    18:122:java.util.Map finalEligibilityCheck():172:276 -> a
+    1:1:void <clinit>():71:71 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.ir.conversion.IRConverter):93:93 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.ir.conversion.IRConverter):77:96 -> <init>
+    1:1:void lambda$run$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):114:114 -> a
+    2:5:void lambda$run$1(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):118:121 -> a
+    6:6:void lambda$run$2(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):127:127 -> a
+    7:16:java.util.Map finalEligibilityCheck():157:166 -> a
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():90:90 -> a
+    17:17:java.util.Map finalEligibilityCheck():167 -> a
+    18:122:java.util.Map finalEligibilityCheck():168:272 -> a
     123:123:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    123:123:java.util.Map finalEligibilityCheck():276 -> a
-    124:124:java.util.Map finalEligibilityCheck():276:276 -> a
+    123:123:java.util.Map finalEligibilityCheck():272 -> a
+    124:124:java.util.Map finalEligibilityCheck():272:272 -> a
     125:125:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    125:125:java.util.Map finalEligibilityCheck():278 -> a
-    126:130:java.util.Map finalEligibilityCheck():279:283 -> a
-    131:144:java.util.Map finalEligibilityCheck():282:295 -> a
-    145:153:com.android.tools.r8.utils.TraversalContinuation lambda$finalEligibilityCheck$5(java.util.Set,java.util.Set,com.android.tools.r8.graph.ProgramMethod):216:224 -> a
-    154:159:com.android.tools.r8.utils.TraversalContinuation lambda$finalEligibilityCheck$5(java.util.Set,java.util.Set,com.android.tools.r8.graph.ProgramMethod):223:228 -> a
-    160:160:boolean lambda$finalEligibilityCheck$7(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):256:256 -> a
+    125:125:java.util.Map finalEligibilityCheck():274 -> a
+    126:130:java.util.Map finalEligibilityCheck():275:279 -> a
+    131:144:java.util.Map finalEligibilityCheck():278:291 -> a
+    145:153:com.android.tools.r8.utils.TraversalContinuation lambda$finalEligibilityCheck$5(java.util.Set,java.util.Set,com.android.tools.r8.graph.ProgramMethod):212:220 -> a
+    154:159:com.android.tools.r8.utils.TraversalContinuation lambda$finalEligibilityCheck$5(java.util.Set,java.util.Set,com.android.tools.r8.graph.ProgramMethod):219:224 -> a
+    160:160:boolean lambda$finalEligibilityCheck$7(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):252:252 -> a
     161:161:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    161:161:boolean lambda$finalEligibilityCheck$7(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):256 -> a
-    162:170:boolean lambda$finalEligibilityCheck$7(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):257:265 -> a
-    171:198:void prepareCandidates(java.util.Map):304:331 -> a
-    199:200:boolean com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.validMethods(com.android.tools.r8.utils.collections.ProgramMethodSet):340:341 -> a
-    199:200:void prepareCandidates(java.util.Map):332 -> a
+    161:161:boolean lambda$finalEligibilityCheck$7(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):252 -> a
+    162:170:boolean lambda$finalEligibilityCheck$7(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):253:261 -> a
+    171:198:void prepareCandidates(java.util.Map):300:327 -> a
+    199:200:boolean com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.validMethods(com.android.tools.r8.utils.collections.ProgramMethodSet):336:337 -> a
+    199:200:void prepareCandidates(java.util.Map):328 -> a
     201:201:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    201:201:boolean com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.validMethods(com.android.tools.r8.utils.collections.ProgramMethodSet):341 -> a
-    201:201:void prepareCandidates(java.util.Map):332 -> a
-    202:203:boolean com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.validMethods(com.android.tools.r8.utils.collections.ProgramMethodSet):342:343 -> a
-    202:203:void prepareCandidates(java.util.Map):332 -> a
-    204:207:void prepareCandidates(java.util.Map):333:336 -> a
-    208:210:boolean lambda$prepareCandidates$8(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):318:320 -> a
-    211:215:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):351:355 -> a
-    216:216:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):354:354 -> a
-    217:217:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):353:353 -> a
-    218:218:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder lambda$enqueueMethodsWithCodeOptimizations$9(com.android.tools.r8.graph.DexEncodedMethod):355:355 -> a
-    219:231:void processMethodsConcurrently(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):371:383 -> a
-    232:235:void lambda$processMethodsConcurrently$10(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):375:375 -> a
-    236:239:void forEachMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Collection,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor):392:395 -> a
-    240:240:void lambda$forEachMethod$11(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,java.util.function.BiConsumer):393:393 -> a
-    241:243:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):399:401 -> a
-    244:244:java.util.function.BiConsumer collectOptimizationInfo(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):407:407 -> a
-    245:253:void lambda$collectOptimizationInfo$12(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):408:408 -> a
-    254:254:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):478:478 -> a
+    201:201:boolean com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.validMethods(com.android.tools.r8.utils.collections.ProgramMethodSet):337 -> a
+    201:201:void prepareCandidates(java.util.Map):328 -> a
+    202:203:boolean com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.validMethods(com.android.tools.r8.utils.collections.ProgramMethodSet):338:339 -> a
+    202:203:void prepareCandidates(java.util.Map):328 -> a
+    204:207:void prepareCandidates(java.util.Map):329:332 -> a
+    208:210:boolean lambda$prepareCandidates$8(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):314:316 -> a
+    211:215:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):347:351 -> a
+    216:216:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):350:350 -> a
+    217:217:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):349:349 -> a
+    218:218:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder lambda$enqueueMethodsWithCodeOptimizations$9(com.android.tools.r8.graph.DexEncodedMethod):351:351 -> a
+    219:231:void processMethodsConcurrently(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):367:379 -> a
+    232:235:void lambda$processMethodsConcurrently$10(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):371:371 -> a
+    236:239:void forEachMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Collection,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor):388:391 -> a
+    240:240:void lambda$forEachMethod$11(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,java.util.function.BiConsumer):389:389 -> a
+    241:243:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):395:397 -> a
+    244:244:java.util.function.BiConsumer collectOptimizationInfo(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):403:403 -> a
+    245:253:void lambda$collectOptimizationInfo$12(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):404:404 -> a
+    254:254:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):474:474 -> a
     255:255:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    255:255:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):478 -> a
-    256:258:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):478:480 -> a
-    259:263:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):479:483 -> a
-    264:264:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):482:482 -> a
-    265:285:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):511:531 -> a
-    286:290:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):538:542 -> a
-    291:308:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):541:558 -> a
-    309:320:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):597:608 -> a
+    255:255:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):474 -> a
+    256:258:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):474:476 -> a
+    259:263:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):475:479 -> a
+    264:264:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):478:478 -> a
+    265:285:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):507:527 -> a
+    286:290:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):534:538 -> a
+    291:308:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):537:554 -> a
+    309:320:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):593:604 -> a
     321:321:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    321:321:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):608 -> a
-    322:322:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):608:608 -> a
+    321:321:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):604 -> a
+    322:322:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):604:604 -> a
     323:323:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    323:323:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):611 -> a
-    324:338:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):611:625 -> a
-    339:345:void fixupStaticizedFieldUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMember):633:639 -> a
-    346:363:void fixupStaticizedFieldUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMember):638:655 -> a
-    364:365:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):659:660 -> a
+    323:323:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):607 -> a
+    324:338:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):607:621 -> a
+    339:345:void fixupStaticizedFieldUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMember):629:635 -> a
+    346:363:void fixupStaticizedFieldUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMember):634:651 -> a
+    364:365:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):655:656 -> a
     366:366:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    366:366:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):660 -> a
-    367:380:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):663:676 -> a
+    366:366:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):656 -> a
+    367:380:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):659:672 -> a
     381:381:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,java.util.Set):330:330 -> a
     381:381:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):326 -> a
-    381:381:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):675 -> a
-    382:382:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):735:735 -> a
-    383:383:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():889:889 -> a
-    383:383:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):737 -> a
-    384:386:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):737:739 -> a
-    387:387:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():889:889 -> a
-    387:387:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):741 -> a
-    388:388:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):741:741 -> a
-    389:393:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):792:796 -> a
-    394:394:boolean lambda$classMembersConflict$14(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):794:794 -> a
-    395:395:boolean lambda$classMembersConflict$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):796:796 -> a
-    396:400:boolean hasMembersNotStaticized(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):802:806 -> a
-    401:401: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):881:881 -> a
-    402:402:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():889:889 -> a
-    402:402: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):882 -> a
-    403:404:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):883:884 -> a
-    405:405:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):882:882 -> a
-    1:28:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):107:134 -> b
-    29:29:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():747:747 -> b
-    29:29:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):138 -> b
+    381:381:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):671 -> a
+    382:382:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):731:731 -> a
+    383:383:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():885:885 -> a
+    383:383:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):733 -> a
+    384:386:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):733:735 -> a
+    387:387:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():885:885 -> a
+    387:387:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):737 -> a
+    388:388:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):737:737 -> a
+    389:393:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):788:792 -> a
+    394:394:boolean lambda$classMembersConflict$14(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):790:790 -> a
+    395:395:boolean lambda$classMembersConflict$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):792:792 -> a
+    396:400:boolean hasMembersNotStaticized(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):798:802 -> a
+    401:401: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):877:877 -> a
+    402:402:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():885:885 -> a
+    402:402: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):878 -> a
+    403:404:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):879:880 -> a
+    405:405:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):878:878 -> a
+    1:28:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):103:130 -> b
+    29:29:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():743:743 -> b
+    29:29:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
     30:30:void com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.<init>():22:22 -> b
-    30:30:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():747 -> b
-    30:30:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):138 -> b
-    31:31:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():749:749 -> b
-    31:31:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):138 -> b
+    30:30:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():743 -> b
+    30:30:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    31:31:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():745:745 -> b
+    31:31:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
     32:32:void com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.<init>():22:22 -> b
-    32:32:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():749 -> b
-    32:32:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):138 -> b
-    33:41:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():752:760 -> b
-    33:41:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):138 -> b
-    42:42:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():889:889 -> b
-    42:42:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():761 -> b
-    42:42:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):138 -> b
-    43:51:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():761:769 -> b
-    43:51:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):138 -> b
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():89:89 -> b
-    52:52:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():772 -> b
-    52:52:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):138 -> b
-    53:57:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():773:777 -> b
-    53:57:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):138 -> b
-    58:70:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):816:828 -> b
-    58:70:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():779 -> b
-    58:70:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):138 -> b
-    71:71:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.DexField):337:337 -> b
-    71:71:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):829 -> b
-    71:71:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():779 -> b
-    71:71:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):138 -> b
-    72:83:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):829:840 -> b
-    72:83:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():779 -> b
-    72:83:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):138 -> b
-    84:84:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.DexField):337:337 -> b
-    84:84:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):841 -> b
-    84:84:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():779 -> b
-    84:84:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):138 -> b
-    85:95:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):841:851 -> b
-    85:95:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():779 -> b
-    85:95:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):138 -> b
+    32:32:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():745 -> b
+    32:32:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    33:41:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():748:756 -> b
+    33:41:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    42:42:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():885:885 -> b
+    42:42:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():757 -> b
+    42:42:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    43:51:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():757:765 -> b
+    43:51:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():90:90 -> b
+    52:52:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():768 -> b
+    52:52:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    53:57:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():769:773 -> b
+    53:57:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    58:70:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):812:824 -> b
+    58:70:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():775 -> b
+    58:70:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    71:71:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.DexField):303:303 -> b
+    71:71:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):825 -> b
+    71:71:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():775 -> b
+    71:71:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    72:83:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):825:836 -> b
+    72:83:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():775 -> b
+    72:83:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    84:84:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.DexField):303:303 -> b
+    84:84:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):837 -> b
+    84:84:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():775 -> b
+    84:84:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    85:95:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):837:847 -> b
+    85:95:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():775 -> b
+    85:95:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
     96:96:boolean com.android.tools.r8.graph.MethodCollection.hasDirectMethods():66:66 -> b
-    96:96:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):851 -> b
-    96:96:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():779 -> b
-    96:96:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):138 -> b
-    97:100:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):855:858 -> b
-    97:100:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():779 -> b
-    97:100:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):138 -> b
-    101:101:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():889:889 -> b
-    101:101:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):861 -> b
-    101:101:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():779 -> b
-    101:101:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):138 -> b
-    102:102:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):862:862 -> b
-    102:102:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():779 -> b
-    102:102:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):138 -> b
-    103:120:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):860:877 -> b
-    103:120:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():779 -> b
-    103:120:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):138 -> b
-    121:122:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():785:786 -> b
-    121:122:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):138 -> b
-    123:137:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):143:157 -> b
-    138:141:void lambda$run$3(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):148:151 -> b
-    142:142:boolean lambda$finalEligibilityCheck$4(com.android.tools.r8.graph.DexEncodedMethod):207:207 -> b
-    143:154:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):419:430 -> b
-    155:155:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():889:889 -> b
-    155:155:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):430 -> b
-    156:163:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):430:437 -> b
+    96:96:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):847 -> b
+    96:96:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():775 -> b
+    96:96:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    97:100:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):851:854 -> b
+    97:100:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():775 -> b
+    97:100:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    101:101:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():885:885 -> b
+    101:101:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):857 -> b
+    101:101:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():775 -> b
+    101:101:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    102:102:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):858:858 -> b
+    102:102:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():775 -> b
+    102:102:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    103:120:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):856:873 -> b
+    103:120:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():775 -> b
+    103:120:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    121:122:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():781:782 -> b
+    121:122:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
+    123:137:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):139:153 -> b
+    138:141:void lambda$run$3(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):144:147 -> b
+    142:142:boolean lambda$finalEligibilityCheck$4(com.android.tools.r8.graph.DexEncodedMethod):203:203 -> b
+    143:154:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):415:426 -> b
+    155:155:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():885:885 -> b
+    155:155:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):426 -> b
+    156:163:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):426:433 -> b
     164:164:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):46:46 -> b
-    164:164:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):437 -> b
-    165:165:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):438:438 -> b
+    164:164:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):433 -> b
+    165:165:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):434:434 -> b
     166:166:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):322:322 -> b
-    166:166:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):439 -> b
-    167:173:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):442:448 -> b
+    166:166:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):435 -> b
+    167:173:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):438:444 -> b
     174:174:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):322:322 -> b
-    174:174:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):449 -> b
-    175:178:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):451:454 -> b
+    174:174:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):445 -> b
+    175:178:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):447:450 -> b
     179:179:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,java.util.Set):330:330 -> b
     179:179:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):326 -> b
-    179:179:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):453 -> b
+    179:179:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):449 -> b
     180:180:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):322:322 -> b
-    180:180:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):457 -> b
-    181:181:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):463:463 -> b
-    1:1:boolean lambda$finalEligibilityCheck$6(com.android.tools.r8.graph.DexEncodedMethod):230:230 -> c
-    2:2:void removeReferencesToThis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):468:468 -> c
-    1:14:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):475:488 -> d
+    180:180:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):453 -> b
+    181:181:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):459:459 -> b
+    1:1:boolean lambda$finalEligibilityCheck$6(com.android.tools.r8.graph.DexEncodedMethod):226:226 -> c
+    2:2:void removeReferencesToThis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):464:464 -> c
+    1:14:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):471:484 -> d
     15:15:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> d
-    15:15:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):488 -> d
-    16:27:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):489:500 -> d
+    15:15:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):484 -> d
+    16:27:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):485:496 -> d
     28:28:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):322:322 -> d
-    28:28:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):501 -> d
-    29:29:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):504:504 -> d
+    28:28:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):497 -> d
+    29:29:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):500:500 -> d
     30:30:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1035:1035 -> d
-    30:30:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):682 -> d
-    30:30:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):505 -> d
-    31:34:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):683:686 -> d
-    31:34:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):505 -> d
+    30:30:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):678 -> d
+    30:30:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):501 -> d
+    31:34:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):679:682 -> d
+    31:34:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):501 -> d
     35:35:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> d
-    35:35:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):686 -> d
-    35:35:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):505 -> d
-    36:45:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):687:696 -> d
-    36:45:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):505 -> d
-    46:48:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):695:697 -> d
-    46:48:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):505 -> d
-    49:49:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):694:694 -> d
-    49:49:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):505 -> d
+    35:35:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):682 -> d
+    35:35:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):501 -> d
+    36:45:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):683:692 -> d
+    36:45:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):501 -> d
+    46:48:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):691:693 -> d
+    46:48:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):501 -> d
+    49:49:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):690:690 -> d
+    49:49:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):501 -> d
     50:50:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> d
-    50:50:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):692 -> d
-    50:50:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):505 -> d
-    51:55:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):703:707 -> d
-    51:55:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):505 -> d
+    50:50:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):688 -> d
+    50:50:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):501 -> d
+    51:55:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):699:703 -> d
+    51:55:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):501 -> d
     56:56:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> d
-    56:56:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):707 -> d
-    56:56:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):505 -> d
-    57:60:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):712:715 -> d
-    57:60:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):505 -> d
-    61:61:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():889:889 -> d
-    61:61:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):717 -> d
-    61:61:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):505 -> d
-    62:70:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):717:725 -> d
-    62:70:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):505 -> d
-    71:73:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):724:726 -> d
-    71:73:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):505 -> d
-    74:78:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):723:727 -> d
-    74:78:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):505 -> d
+    56:56:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):703 -> d
+    56:56:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):501 -> d
+    57:60:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):708:711 -> d
+    57:60:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):501 -> d
+    61:61:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():885:885 -> d
+    61:61:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):713 -> d
+    61:61:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):501 -> d
+    62:70:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):713:721 -> d
+    62:70:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):501 -> d
+    71:73:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):720:722 -> d
+    71:73:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):501 -> d
+    74:78:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):719:723 -> d
+    74:78:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):501 -> d
     79:79:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):39:39 -> d
-    79:79:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):727 -> d
-    79:79:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):505 -> d
+    79:79:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):723 -> d
+    79:79:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):501 -> d
 com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis -> com.android.tools.r8.ir.optimize.string.d:
 com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$1 -> com.android.tools.r8.ir.optimize.string.a:
 com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$AbstractStateImpl -> com.android.tools.r8.ir.optimize.string.b:
@@ -92977,7 +93090,7 @@ com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenati
     126:128:void removeTrivialBuilders():808:810 -> b
     1:1:java.util.Map getBuilderState(com.android.tools.r8.ir.code.Value):321:321 -> c
     1:1:java.util.Map lambda$createBuilderState$0(com.android.tools.r8.ir.code.Value):316:316 -> d
-com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.internal.Wo1:
+com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.internal.Oo1:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
@@ -93100,15 +93213,15 @@ com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.
     2:2:java.lang.Integer lambda$computeTrivialOperationsOnConstString$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):226 -> i
     3:3:java.lang.Integer lambda$computeTrivialOperationsOnConstString$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):226:226 -> i
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$9(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):228:228 -> j
-com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.internal.Vo1:
+com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.internal.No1:
     com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration INSTANCE -> a
     1:1:void <clinit>():571:571 -> <clinit>
     1:1:void <init>():574:574 -> <init>
     1:1:com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration getInstance():577:577 -> a
     2: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.ProgramMethod):586:606 -> a
-com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.mF0:
+com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.pF0:
     1:1:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):35:35 -> a
-com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization -> com.android.tools.r8.internal.QF0:
+com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization -> com.android.tools.r8.internal.TF0:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.utils.collections.SortedProgramMethodSet candidatesForInstanceOfOptimization -> d
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple feedback -> e
@@ -93220,7 +93333,7 @@ com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator -> com.android.tool
     254:254:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):346 -> a
     255:278: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):475:498 -> a
     255:278:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):346 -> a
-    279:279:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1594:1594 -> a
+    279:279:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
     279:279: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):501 -> a
     279:279:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):346 -> a
     280:282: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):501:503 -> a
@@ -93340,7 +93453,7 @@ com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator -> com.android.tool
     914:914: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):2338 -> a
     915:922: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):2339:2346 -> a
     923:958: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):2454:2489 -> a
-    959:959:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    959:959:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     959:959:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2665 -> a
     959:959: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):2489 -> a
     960:966: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):2489:2495 -> a
@@ -93362,10 +93475,10 @@ com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator -> com.android.tool
     987:987:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2553 -> a
     988:1015:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2554:2581 -> a
     1016:1022:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2578:2584 -> a
-    1023:1023:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    1023:1023:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     1023:1023:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2584 -> a
     1024:1031:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2584:2591 -> a
-    1032:1032:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    1032:1032:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     1032:1032:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2665 -> a
     1032:1032:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2591 -> a
     1033:1070:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2591:2628 -> a
@@ -93886,7 +93999,7 @@ com.android.tools.r8.ir.regalloc.LiveIntervals -> com.android.tools.r8.ir.regall
     1:1:boolean isLinked():138:138 -> x
     1:3:boolean isNewStringInstanceDisallowingSpilling():536:538 -> y
     1:1:boolean isSpilled():111:111 -> z
-com.android.tools.r8.ir.regalloc.LiveIntervalsUse -> com.android.tools.r8.internal.r51:
+com.android.tools.r8.ir.regalloc.LiveIntervalsUse -> com.android.tools.r8.internal.u51:
     int limit -> b
     int position -> a
     1:3:void <init>(int,int):12:14 -> <init>
@@ -93898,7 +94011,7 @@ com.android.tools.r8.ir.regalloc.LiveIntervalsUse -> com.android.tools.r8.intern
     2:5:int compareTo(java.lang.Object):8 -> compareTo
     1:5:boolean equals(java.lang.Object):32:36 -> equals
     1:1:int hashCode():27:27 -> hashCode
-com.android.tools.r8.ir.regalloc.LiveRange -> com.android.tools.r8.internal.t51:
+com.android.tools.r8.ir.regalloc.LiveRange -> com.android.tools.r8.internal.w51:
     com.android.tools.r8.ir.regalloc.LiveRange INFINITE -> c
     int end -> b
     int start -> a
@@ -93908,7 +94021,7 @@ com.android.tools.r8.ir.regalloc.LiveRange -> com.android.tools.r8.internal.t51:
     2:5:int com.android.tools.r8.ir.regalloc.LiveRange.compareTo(com.android.tools.r8.ir.regalloc.LiveRange):20:23 -> compareTo
     2:5:int compareTo(java.lang.Object):6 -> compareTo
     1:1:java.lang.String toString():28:28 -> toString
-com.android.tools.r8.ir.regalloc.RegisterAllocator -> com.android.tools.r8.internal.yk1:
+com.android.tools.r8.ir.regalloc.RegisterAllocator -> com.android.tools.r8.internal.wk1:
     void addNewBlockToShareIdenticalSuffix(com.android.tools.r8.ir.code.BasicBlock,int,java.util.List) -> a
     void allocateRegisters() -> a
     int getRegisterForValue(com.android.tools.r8.ir.code.Value,int) -> a
@@ -93917,7 +94030,7 @@ com.android.tools.r8.ir.regalloc.RegisterAllocator -> com.android.tools.r8.inter
     void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> b
     com.android.tools.r8.utils.InternalOptions options() -> b
     int registersUsed() -> c
-com.android.tools.r8.ir.regalloc.RegisterMove -> com.android.tools.r8.internal.zk1:
+com.android.tools.r8.ir.regalloc.RegisterMove -> com.android.tools.r8.internal.xk1:
     com.android.tools.r8.ir.analysis.type.TypeElement type -> a
     com.android.tools.r8.ir.code.Instruction definition -> d
     boolean $assertionsDisabled -> e
@@ -93933,7 +94046,7 @@ com.android.tools.r8.ir.regalloc.RegisterMove -> com.android.tools.r8.internal.z
     1:4:boolean writes(int):36:39 -> d
     1:5:boolean equals(java.lang.Object):68:72 -> equals
     1:1:int hashCode():63:63 -> hashCode
-com.android.tools.r8.ir.regalloc.RegisterMoveScheduler -> com.android.tools.r8.internal.Ak1:
+com.android.tools.r8.ir.regalloc.RegisterMoveScheduler -> com.android.tools.r8.internal.yk1:
     java.util.Map valueMap -> b
     int tempRegister -> f
     java.util.Set moveSet -> a
@@ -93964,7 +94077,7 @@ com.android.tools.r8.ir.regalloc.RegisterMoveScheduler -> com.android.tools.r8.i
     88:102:void com.android.tools.r8.ir.regalloc.RegisterMoveScheduler.createMoveDestToTemp(com.android.tools.r8.ir.regalloc.RegisterMove):170:184 -> b
     88:102:void schedule():107 -> b
     103:103:void schedule():108:108 -> b
-com.android.tools.r8.ir.regalloc.RegisterPositions -> com.android.tools.r8.internal.Ck1:
+com.android.tools.r8.ir.regalloc.RegisterPositions -> com.android.tools.r8.internal.Ak1:
     int[] backing -> b
     boolean $assertionsDisabled -> f
     java.util.BitSet registerHoldsConstant -> c
@@ -93992,7 +94105,7 @@ com.android.tools.r8.ir.regalloc.RegisterPositions -> com.android.tools.r8.inter
     2:10:void com.android.tools.r8.ir.regalloc.RegisterPositions.grow(int):90:98 -> b
     2:10:void set(int,int):68 -> b
     11:11:void set(int,int):70:70 -> b
-com.android.tools.r8.ir.regalloc.RegisterPositions$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Bk1:
+com.android.tools.r8.ir.regalloc.RegisterPositions$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.zk1:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
@@ -94030,7 +94143,7 @@ com.android.tools.r8.ir.regalloc.SpillMoveSet -> com.android.tools.r8.ir.regallo
     24:24:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
     24:24:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):287 -> a
     25:31:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):288:294 -> a
-    32:32:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1594:1594 -> a
+    32:32:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
     32:32:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):294 -> a
     33:44:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):299:310 -> a
     45:48:void pruneParallelMoveSets(java.util.Set,java.util.Set,java.util.Set):269:272 -> a
@@ -94095,36 +94208,36 @@ com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode -> com.android.tools.r
     1:1:java.lang.String toString():67 -> toString
 com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider -> com.android.tools.r8.internal.m1:
     com.android.tools.r8.ir.conversion.SourceCode get(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position) -> a
-com.android.tools.r8.ir.synthetic.CallObjectInitCfCodeProvider -> com.android.tools.r8.internal.LC0:
+com.android.tools.r8.ir.synthetic.CallObjectInitCfCodeProvider -> com.android.tools.r8.internal.OC0:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):23:23 -> <init>
     1:6:com.android.tools.r8.graph.CfCode generateCfCode():28:33 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.internal.UK0:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.internal.XK0:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):47:47 -> <init>
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APICallbackWrapperCfCodeProvider -> com.android.tools.r8.internal.MK0:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APICallbackWrapperCfCodeProvider -> com.android.tools.r8.internal.PK0:
     com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer eventConsumer -> f
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer,boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):220:221 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):231:231 -> a
     1:1:void generatePushReceiver(java.util.List):226:226 -> b
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConversionCfCodeProvider -> com.android.tools.r8.internal.NK0:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConversionCfCodeProvider -> com.android.tools.r8.internal.QK0:
     com.android.tools.r8.cf.code.CfInvoke initialInvoke -> c
     com.android.tools.r8.graph.DexMethod[] parameterConversions -> e
     com.android.tools.r8.graph.DexMethod returnConversion -> d
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):337:340 -> <init>
     1:29:com.android.tools.r8.graph.CfCode generateCfCode():345:373 -> a
     30:43:com.android.tools.r8.graph.CfCode generateCfCode():372:385 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.internal.OK0:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.internal.RK0:
     com.android.tools.r8.graph.DexField wrapperField -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):394:395 -> <init>
     1:9:com.android.tools.r8.graph.CfCode generateCfCode():400:408 -> a
     10:10:com.android.tools.r8.graph.CfCode generateCfCode():406:406 -> a
     11:23:com.android.tools.r8.graph.CfCode generateCfCode():403:415 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.internal.PK0:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.internal.SK0:
     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):426:427 -> <init>
     1:11:com.android.tools.r8.graph.CfCode generateCfCode():432:442 -> a
     12:12:com.android.tools.r8.graph.CfCode generateCfCode():440:440 -> a
     13:22:com.android.tools.r8.graph.CfCode generateCfCode():437:446 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.internal.QK0:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.internal.TK0:
     com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer wrapperSynthesizer -> e
     boolean itfCall -> f
     com.android.tools.r8.graph.DexField wrapperField -> c
@@ -94145,12 +94258,12 @@ com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$AP
     44:44:com.android.tools.r8.graph.CfCode generateCfCode():126 -> a
     45:45:com.android.tools.r8.graph.CfCode generateCfCode():125:125 -> a
     46:58:com.android.tools.r8.graph.CfCode generateCfCode():122:134 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.RK0:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.UK0:
     com.android.tools.r8.graph.DexField wrapperField -> f
     1:2: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.desugaredlibrary.DesugaredLibraryWrapperSynthesizer,boolean):246:247 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):258:258 -> a
     1:2:void generatePushReceiver(java.util.List):252:253 -> b
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.internal.SK0:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.internal.VK0:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexField wrapperField -> d
     com.android.tools.r8.graph.DexField reverseWrapperField -> c
@@ -94162,7 +94275,7 @@ com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$AP
     6:41:com.android.tools.r8.graph.CfCode generateCfCode():282:317 -> a
     42:42:com.android.tools.r8.graph.CfCode generateCfCode():315:315 -> a
     43:52:com.android.tools.r8.graph.CfCode generateCfCode():312:321 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$AbstractAPIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.TK0:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$AbstractAPIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.WK0:
     com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> d
     boolean itfCall -> e
     com.android.tools.r8.graph.DexMethod forwardMethod -> c
@@ -94181,7 +94294,7 @@ com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$Ab
     38:38:com.android.tools.r8.graph.CfCode generateCfCode():198 -> a
     39:44:com.android.tools.r8.graph.CfCode generateCfCode():200:205 -> a
     void generatePushReceiver(java.util.List) -> b
-com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.internal.jN0:
+com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.internal.mN0:
     java.util.List extraDispatchCases -> f
     com.android.tools.r8.graph.DexType interfaceType -> c
     com.android.tools.r8.graph.DexMethod libraryMethod -> e
@@ -94193,7 +94306,7 @@ com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com
     6:48:com.android.tools.r8.graph.CfCode generateCfCode():63:105 -> a
     1:4:void addReturn(java.util.List):116:119 -> b
     1:2:void loadExtraParameters(java.util.List):110:111 -> c
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider -> com.android.tools.r8.internal.PN0:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider -> com.android.tools.r8.internal.SN0:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():42:42 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):45:45 -> <init>
@@ -94202,7 +94315,7 @@ com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider -> com.android.tool
     4:4:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):55 -> a
     5:8:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):56:56 -> a
     12:12:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):60:60 -> a
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingInstanceFieldCfCodeProvider -> com.android.tools.r8.internal.NN0:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingInstanceFieldCfCodeProvider -> com.android.tools.r8.internal.QN0:
     com.android.tools.r8.ir.analysis.value.AbstractValue nullValue -> f
     com.android.tools.r8.graph.DexType returnType -> d
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData fieldDataMap -> e
@@ -94212,7 +94325,7 @@ com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingInstanc
     3:3:com.android.tools.r8.graph.CfCode generateCfCode():100 -> a
     4:32:com.android.tools.r8.graph.CfCode generateCfCode():100:128 -> a
     33:40:void lambda$generateCfCode$0(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap,java.lang.Integer,com.android.tools.r8.ir.analysis.value.AbstractValue):108:115 -> a
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValueOfCfCodeProvider -> com.android.tools.r8.internal.ON0:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValueOfCfCodeProvider -> com.android.tools.r8.internal.RN0:
     com.android.tools.r8.graph.DexType enumType -> d
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData fieldDataMap -> e
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData):142:144 -> <init>
@@ -94223,7 +94336,7 @@ com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValueOf
     46:46:com.android.tools.r8.graph.CfCode generateCfCode():200:200 -> a
     47:61:com.android.tools.r8.graph.CfCode generateCfCode():196:210 -> a
     62:71:void lambda$generateCfCode$0(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap,java.lang.Integer,com.android.tools.r8.ir.analysis.value.AbstractValue):181:190 -> a
-com.android.tools.r8.ir.synthetic.FieldAccessorBuilder -> com.android.tools.r8.internal.IO0:
+com.android.tools.r8.ir.synthetic.FieldAccessorBuilder -> com.android.tools.r8.internal.LO0:
     com.android.tools.r8.utils.OptionalBool isSetter -> c
     com.android.tools.r8.utils.OptionalBool isInstanceField -> b
     boolean $assertionsDisabled -> e
@@ -94264,7 +94377,7 @@ com.android.tools.r8.ir.synthetic.FieldAccessorBuilder -> com.android.tools.r8.i
     1:1:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder builder():35:35 -> b
     1:1:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder setGetter():57:57 -> c
     1:1:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder setSetter():68:68 -> d
-com.android.tools.r8.ir.synthetic.ForwardMethodBuilder -> com.android.tools.r8.internal.PP0:
+com.android.tools.r8.ir.synthetic.ForwardMethodBuilder -> com.android.tools.r8.internal.SP0:
     java.lang.Boolean isInterface -> g
     boolean isConstructorDelegate -> i
     boolean $assertionsDisabled -> k
@@ -94380,12 +94493,12 @@ com.android.tools.r8.ir.synthetic.ForwardMethodBuilder -> com.android.tools.r8.i
     4:6:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setSuperTarget(com.android.tools.r8.graph.DexMethod,boolean):110:112 -> c
     1:2:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setStaticSource(com.android.tools.r8.graph.DexMethod):97:98 -> d
     3:5:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setVirtualTarget(com.android.tools.r8.graph.DexMethod,boolean):117:119 -> d
-com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.OP0:
+com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.RP0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.internal.RP0:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.internal.UP0:
     com.android.tools.r8.graph.DexMethod target -> n
     boolean castResult -> p
     com.android.tools.r8.graph.DexType targetReceiver -> m
@@ -94402,7 +94515,7 @@ com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r
     1:1:void lambda$prepareInstructions$3(int,com.android.tools.r8.ir.conversion.IRBuilder):215:215 -> d
     1:36:void prepareInstructions():180:215 -> i
     1:27:boolean checkSignatures():147:173 -> j
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.internal.QP0:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.internal.TP0:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> f
     com.android.tools.r8.graph.DexType targetReceiver -> d
     com.android.tools.r8.graph.DexMethod target -> e
@@ -94418,13 +94531,13 @@ com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android
     5:5:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode build(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):91:91 -> a
     1:1:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setTargetReceiver(com.android.tools.r8.graph.DexType):61:61 -> b
     2:2:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setTarget(com.android.tools.r8.graph.DexMethod):66:66 -> b
-com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordEqualsCfCodeProvider -> com.android.tools.r8.internal.Bi1:
+com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordEqualsCfCodeProvider -> com.android.tools.r8.internal.zi1:
     com.android.tools.r8.graph.DexMethod getFieldsAsObjects -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):121:122 -> <init>
     1:1:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.builder():38:38 -> a
     1:1:com.android.tools.r8.graph.CfCode generateCfCode():140 -> a
     2:28:com.android.tools.r8.graph.CfCode generateCfCode():141:167 -> a
-com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordGetFieldsAsObjectsCfCodeProvider -> com.android.tools.r8.internal.Ci1:
+com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordGetFieldsAsObjectsCfCodeProvider -> com.android.tools.r8.internal.Ai1:
     com.android.tools.r8.graph.DexField[] fields -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField[]):68:69 -> <init>
     1:2:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):56:57 -> a
@@ -94433,15 +94546,12 @@ com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordGetFieldsAsObjectsC
     39:45:void lambda$generateCfCode$1(com.android.tools.r8.graph.DexField,java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):94:100 -> a
     46:46:void lambda$generateCfCode$1(com.android.tools.r8.graph.DexField,java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):98:98 -> a
     47:47:void lambda$generateCfCode$1(com.android.tools.r8.graph.DexField,java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):95:95 -> a
-com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.internal.Xp1:
-    java.util.function.Consumer registryCallback -> d
+com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.internal.Pp1:
     com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider sourceCodeProvider -> c
-    1:1:void <init>(com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider):17:17 -> <init>
-    2:4:void <init>(com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider,java.util.function.Consumer):20:22 -> <init>
-    1:1:java.util.function.Consumer getRegistryCallback():32:32 -> X
-    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():27:27 -> Y
-    1:1:void registerReachableDefinitionsDefault(com.android.tools.r8.graph.UseRegistry):36:36 -> a
-com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.internal.bq1:
+    1:2:void <init>(com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider):14:15 -> <init>
+    java.util.function.Consumer getRegistryCallback() -> X
+    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():20:20 -> Y
+com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.internal.Tp1:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexType holder -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):20:22 -> <init>
@@ -94451,7 +94561,7 @@ com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r
     2:2:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):37 -> a
     3:3:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):38:38 -> a
     1:1:com.android.tools.r8.graph.DexType getHolder():26:26 -> b
-com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.internal.nq1:
+com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.internal.fq1:
     int[] paramRegisters -> f
     java.util.function.Predicate doesNotEndBlock -> j
     java.util.function.Predicate endsBlock -> k
@@ -94502,23 +94612,23 @@ com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.in
     1:3:int getParamRegister(int):92:94 -> h
     4:4:int nextInstructionIndex():109:109 -> h
     void prepareInstructions() -> i
-com.android.tools.r8.it.unimi.dsi.fastutil.Arrays -> com.android.tools.r8.internal.Wz0:
+com.android.tools.r8.it.unimi.dsi.fastutil.Arrays -> com.android.tools.r8.internal.Zz0:
     1:1:void ensureFromTo(int,int,int):57:57 -> a
     2:2:void ensureFromTo(int,int,int):56:56 -> a
     3:3:void ensureFromTo(int,int,int):55:55 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.Function -> com.android.tools.r8.internal.kQ0:
+com.android.tools.r8.it.unimi.dsi.fastutil.Function -> com.android.tools.r8.internal.nQ0:
 # {"id":"sourceFile","fileName":"Function.java"}
-com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.internal.ZQ0:
+com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.internal.cR0:
     boolean equals(java.lang.Object,java.lang.Object) -> a
     int hashCode(java.lang.Object) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.HashCommon -> com.android.tools.r8.internal.qR0:
+com.android.tools.r8.it.unimi.dsi.fastutil.HashCommon -> com.android.tools.r8.internal.tR0:
     int long2int(long) -> a
     int mix(int) -> a
     1:2:int arraySize(int,float):228:229 -> a
     long mix(long) -> b
     1:1:int maxFill(int,float):205:205 -> b
     long nextPowerOfTwo(long) -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.Stack -> com.android.tools.r8.internal.Mn1:
+com.android.tools.r8.it.unimi.dsi.fastutil.Stack -> com.android.tools.r8.internal.En1:
 com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanCollection -> com.android.tools.r8.internal.h:
     1:1:void <init>():37:37 -> <init>
     1:1:boolean add(boolean):68:68 -> a
@@ -94563,7 +94673,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanSet -> com.an
     boolean remove(boolean) -> d
     1:4:boolean equals(java.lang.Object):41:44 -> equals
     1:5:int hashCode():57:61 -> hashCode
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet -> com.android.tools.r8.internal.MB0:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet -> com.android.tools.r8.internal.PB0:
     int size -> b
     1:4:void <init>(boolean[],int):104:107 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet):29:29 -> a
@@ -94583,20 +94693,20 @@ com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet -> com.andro
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet.iterator():119:119 -> iterator
     2:2:java.util.Iterator iterator():29 -> iterator
     1:1:int size():148:148 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet$1 -> com.android.tools.r8.internal.LB0:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet$1 -> com.android.tools.r8.internal.OB0:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet this$0 -> b
     int next -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet):119:120 -> <init>
     1:3:boolean nextBoolean():129:129 -> g
     1:1:boolean hasNext():124:124 -> hasNext
     1:2:void remove():135:136 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.internal.NB0:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.internal.QB0:
     boolean[] EMPTY_ARRAY -> a
     1:1:void <clinit>():95:95 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection -> com.android.tools.r8.internal.PB0:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.internal.SB0:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection -> com.android.tools.r8.internal.SB0:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.internal.VB0:
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection):536:536 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$EmptyCollection -> com.android.tools.r8.internal.QB0:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$EmptyCollection -> com.android.tools.r8.internal.TB0:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     boolean contains(boolean) -> b
@@ -94605,7 +94715,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$EmptyColl
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$UnmodifiableCollection -> com.android.tools.r8.internal.RB0:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$UnmodifiableCollection -> com.android.tools.r8.internal.UB0:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection):369:371 -> <init>
     1:1:boolean add(java.lang.Object):365:365 -> add
@@ -94633,17 +94743,17 @@ com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$Unmodifia
     1:1:java.lang.Object[] toArray(java.lang.Object[]):422:422 -> toArray
     2:2:java.lang.Object[] toArray():427:427 -> toArray
     1:1:java.lang.String toString():512:512 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator -> com.android.tools.r8.internal.TB0:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator -> com.android.tools.r8.internal.WB0:
     boolean nextBoolean() -> g
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators -> com.android.tools.r8.internal.XB0:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators -> com.android.tools.r8.internal.aC0:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator EMPTY_ITERATOR -> a
     1:1:void <clinit>():103:103 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator -> com.android.tools.r8.internal.UB0:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator -> com.android.tools.r8.internal.XB0:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():87:87 -> clone
     1:1:boolean nextBoolean():57:57 -> g
     1:1:boolean previousBoolean():62:62 -> l
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$SingletonIterator -> com.android.tools.r8.internal.VB0:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$SingletonIterator -> com.android.tools.r8.internal.YB0:
     boolean element -> a
     int curr -> b
     1:2:void <init>(boolean):110:111 -> <init>
@@ -94653,22 +94763,22 @@ com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$SingletonIt
     1:4:boolean previousBoolean():133:133 -> l
     1:1:int nextIndex():140:140 -> nextIndex
     1:1:int previousIndex():145:145 -> previousIndex
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$UnmodifiableIterator -> com.android.tools.r8.internal.WB0:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$UnmodifiableIterator -> com.android.tools.r8.internal.ZB0:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator i -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator):724:725 -> <init>
     1:1:boolean nextBoolean():735:735 -> g
     1:1:boolean hasNext():730:730 -> hasNext
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSet -> com.android.tools.r8.internal.bC0:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets -> com.android.tools.r8.internal.eC0:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSet -> com.android.tools.r8.internal.eC0:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets -> com.android.tools.r8.internal.hC0:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():76:76 -> <clinit>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSet singleton(boolean):159:159 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$EmptySet -> com.android.tools.r8.internal.cC0:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$EmptySet -> com.android.tools.r8.internal.fC0:
     1:1:void <init>():42:42 -> <init>
     boolean rem(boolean) -> c
     1:1:java.lang.Object clone():52:52 -> clone
     1:1:boolean equals(java.lang.Object):58:58 -> equals
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$Singleton -> com.android.tools.r8.internal.dC0:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$Singleton -> com.android.tools.r8.internal.gC0:
     boolean element -> a
     1:2:void <init>(boolean):89:90 -> <init>
     1:1:boolean addAll(java.util.Collection):115:115 -> addAll
@@ -94952,6 +95062,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator -> com.andro
     1:1:void remove():68:68 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList -> com.android.tools.r8.internal.E:
     1:1:void <init>():33:33 -> <init>
+    boolean add(int) -> a
     boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList) -> a
     void removeElements(int,int) -> a
     1:1:int compareTo(java.util.List):464:464 -> a
@@ -95124,7 +95235,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSet -> com.android.to
     1:1:boolean rem(int):87:87 -> g
     1:5:int hashCode():57:61 -> hashCode
     1:1:boolean remove(int):75:75 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap -> com.android.tools.r8.internal.GU0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap -> com.android.tools.r8.internal.JU0:
     int[] key -> b
     int[] value -> c
     int size -> d
@@ -95161,8 +95272,8 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap -> com.android.t
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):536:536 -> values
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap.values():321 -> values
     2:2:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$1 -> com.android.tools.r8.internal.DU0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.internal.FU0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$1 -> com.android.tools.r8.internal.GU0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.internal.IU0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$1):133:133 -> <init>
@@ -95172,7 +95283,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):212:223 -> remove
     1:1:int size():195:195 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.EU0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.HU0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -95181,13 +95292,13 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1 -> co
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:6:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntFunction -> com.android.tools.r8.internal.HU0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntFunction -> com.android.tools.r8.internal.KU0:
     boolean containsKey(int) -> a
     int put(int,int) -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.internal.IU0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.internal.LU0:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet -> com.android.tools.r8.internal.JU0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.internal.TU0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet -> com.android.tools.r8.internal.MU0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.internal.WU0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet entries -> i
     int[] key -> b
     int[] value -> c
@@ -95248,14 +95359,14 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.androi
     1:1:int size():428:428 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.values():866:887 -> values
     1:22:java.util.Collection values():50 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1 -> com.android.tools.r8.internal.LU0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1 -> com.android.tools.r8.internal.OU0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):866:866 -> <init>
     1:1:void clear():884:884 -> clear
     1:1:boolean contains(int):879:879 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():869:869 -> iterator
     1:1:int size():874:874 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.MU0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.PU0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):664:664 -> <init>
@@ -95263,13 +95374,13 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator.next():669:669 -> next
     1:1:java.lang.Object next():664 -> next
     1:2:void remove():674:675 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.NU0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.QU0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):787:788 -> <init>
     1:1:int nextInt():793:793 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeyIterator.next():799:799 -> next
     1:1:java.lang.Object next():786 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.OU0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.RU0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):803:803 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1):803:803 -> <init>
@@ -95278,7 +95389,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():806:806 -> iterator
     1:3:boolean remove(int):821:823 -> remove
     1:1:int size():811:811 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.PU0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.SU0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,int):472:473 -> <init>
@@ -95299,7 +95410,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry -> c
     5:5:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry.setValue(java.lang.Integer):529:529 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):467 -> setValue
     1:1:java.lang.String toString():547:547 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.QU0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.TU0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):689:689 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1):689:689 -> <init>
@@ -95308,7 +95419,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntrySet -
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():691:691 -> iterator
     1:30:boolean remove(java.lang.Object):724:753 -> remove
     1:1:int size():762:762 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.RU0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.UU0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> f
     int last -> b
@@ -95326,16 +95437,16 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapIterator -
     13:22:void remove():644 -> remove
     23:24:void remove():647:648 -> remove
     25:25:void remove():641:641 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.SU0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.VU0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):848:849 -> <init>
     1:1:int nextInt():854:854 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator.next():860:860 -> next
     1:1:java.lang.Object next():847 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry -> com.android.tools.r8.internal.UU0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry -> com.android.tools.r8.internal.XU0:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$FastEntrySet -> com.android.tools.r8.internal.VU0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap -> com.android.tools.r8.internal.eV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$FastEntrySet -> com.android.tools.r8.internal.YU0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap -> com.android.tools.r8.internal.hV0:
     java.lang.Object[] value -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$FastEntrySet entries -> h
     int maxFill -> f
@@ -95397,14 +95508,14 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap -> com.and
     1:1:int size():386:386 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap.values():794:815 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1 -> com.android.tools.r8.internal.WU0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1 -> com.android.tools.r8.internal.ZU0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):794:794 -> <init>
     1:1:void clear():812:812 -> clear
     1:1:boolean contains(java.lang.Object):807:807 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():797:797 -> iterator
     1:1:int size():802:802 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$EntryIterator -> com.android.tools.r8.internal.XU0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$EntryIterator -> com.android.tools.r8.internal.aV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):600:600 -> <init>
@@ -95412,13 +95523,13 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$EntryItera
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$EntryIterator.next():605:605 -> next
     1:1:java.lang.Object next():600 -> next
     1:2:void remove():610:611 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeyIterator -> com.android.tools.r8.internal.YU0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeyIterator -> com.android.tools.r8.internal.bV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):721:722 -> <init>
     1:1:int nextInt():727:727 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeyIterator.next():733:733 -> next
     1:1:java.lang.Object next():720 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeySet -> com.android.tools.r8.internal.ZU0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeySet -> com.android.tools.r8.internal.cV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):737:737 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1):737:737 -> <init>
@@ -95427,7 +95538,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeySet ->
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     1:3:boolean remove(int):755:757 -> remove
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry -> com.android.tools.r8.internal.aV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry -> com.android.tools.r8.internal.dV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,int):430:431 -> <init>
@@ -95439,7 +95550,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry -
     1:1:int hashCode():476:476 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):449:450 -> setValue
     1:1:java.lang.String toString():481:481 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.bV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.eV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):625:625 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1):625:625 -> <init>
@@ -95448,7 +95559,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntrySe
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():627:627 -> iterator
     1:29:boolean remove(java.lang.Object):659:687 -> remove
     1:1:int size():696:696 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapIterator -> com.android.tools.r8.internal.cV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapIterator -> com.android.tools.r8.internal.fV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> f
     int last -> b
@@ -95466,11 +95577,11 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapIterato
     15:24:void remove():580 -> remove
     25:26:void remove():583:584 -> remove
     27:27:void remove():576:576 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$ValueIterator -> com.android.tools.r8.internal.dV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$ValueIterator -> com.android.tools.r8.internal.gV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):782:783 -> <init>
     1:1:java.lang.Object next():788:788 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap -> com.android.tools.r8.internal.xV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap -> com.android.tools.r8.internal.AV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry lastEntry -> e
     boolean modified -> i
@@ -95659,14 +95770,14 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap -> com.a
     209:212:java.lang.Object remove(int):494:497 -> remove
     1:1:int size():985:985 -> size
     1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1384:1401 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1 -> com.android.tools.r8.internal.fV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1 -> com.android.tools.r8.internal.iV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):102:102 -> <init>
     1:1:int compare(int,int):104:104 -> a
     1:1:int compare(java.lang.Object,java.lang.Object):102:102 -> compare
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1.compare(java.lang.Integer,java.lang.Integer):108:108 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):102 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 -> com.android.tools.r8.internal.hV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 -> com.android.tools.r8.internal.kV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> b
     java.util.Comparator comparator -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1161:1162 -> <init>
@@ -95689,20 +95800,20 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 -> com
     1:1:java.util.SortedSet tailSet(java.lang.Object):1161:1161 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1236:1236 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1161 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2$1 -> com.android.tools.r8.internal.gV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2$1 -> com.android.tools.r8.internal.jV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2):1162:1162 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1162:1162 -> compare
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2$1.compare(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1164:1164 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1162 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$3 -> com.android.tools.r8.internal.iV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$3 -> com.android.tools.r8.internal.lV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1384:1384 -> <init>
     1:1:void clear():1398:1398 -> clear
     1:1:boolean contains(java.lang.Object):1390:1390 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1386:1386 -> iterator
     1:1:int size():1394:1394 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry -> com.android.tools.r8.internal.jV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry -> com.android.tools.r8.internal.mV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry right -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry left -> c
     int info -> e
@@ -95729,7 +95840,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry ->
     1:1:boolean succ():795:795 -> j
     1:2:java.lang.Object setValue(java.lang.Object):923:924 -> setValue
     1:1:java.lang.String toString():958:958 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator -> com.android.tools.r8.internal.kV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator -> com.android.tools.r8.internal.nV0:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1131:1131 -> <init>
     1:1:void add(java.lang.Object):1130:1130 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1155:1155 -> add
@@ -95741,7 +95852,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIte
     1:1:void set(java.lang.Object):1130:1130 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1150:1150 -> set
     2:2:void set(java.lang.Object):1130 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator -> com.android.tools.r8.internal.lV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator -> com.android.tools.r8.internal.oV0:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1253:1253 -> <init>
     1:1:void add(java.lang.Object):1252:1252 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator.add(java.lang.Integer):1301:1301 -> add
@@ -95755,12 +95866,12 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyItera
     1:1:void set(java.lang.Object):1252:1252 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator.set(java.lang.Integer):1295:1295 -> set
     2:2:void set(java.lang.Object):1252 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeySet -> com.android.tools.r8.internal.mV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeySet -> com.android.tools.r8.internal.pV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1308:1308 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1308:1308 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1311:1311 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap -> com.android.tools.r8.internal.uV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap -> com.android.tools.r8.internal.xV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
@@ -95802,7 +95913,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap -
     1:4:java.lang.Object remove(int):1657:1660 -> remove
     1:5:int size():1665:1669 -> size
     1:21:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1598:1618 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1 -> com.android.tools.r8.internal.nV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1 -> com.android.tools.r8.internal.qV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1497:1497 -> <init>
     1:1:void clear():1549:1549 -> clear
@@ -95832,19 +95943,19 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1
     1:1:java.util.SortedSet tailSet(java.lang.Object):1497:1497 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1574:1574 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1497 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$2 -> com.android.tools.r8.internal.oV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$2 -> com.android.tools.r8.internal.rV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1598:1598 -> <init>
     1:1:void clear():1615:1615 -> clear
     1:1:boolean contains(java.lang.Object):1605:1605 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1600:1600 -> iterator
     1:1:int size():1610:1610 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$KeySet -> com.android.tools.r8.internal.pV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$KeySet -> com.android.tools.r8.internal.sV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1580:1580 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1580:1580 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1582:1582 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.qV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.tV0:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1808:1808 -> <init>
     1:1:void add(java.lang.Object):1807:1807 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1832:1832 -> add
@@ -95856,12 +95967,12 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$S
     1:1:void set(java.lang.Object):1807:1807 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1827:1827 -> set
     2:2:void set(java.lang.Object):1807 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.rV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.uV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1777:1778 -> <init>
     1:2:void updateNext():1802:1803 -> n
     1:2:void updatePrevious():1797:1798 -> o
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.sV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.vV0:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1848:1848 -> <init>
     1:1:void add(java.lang.Object):1846:1846 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator.add(java.lang.Integer):1896:1896 -> add
@@ -95875,14 +95986,14 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$S
     1:1:void set(java.lang.Object):1846:1846 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator.set(java.lang.Integer):1890:1890 -> set
     2:2:void set(java.lang.Object):1846 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.tV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.wV0:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1910:1910 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1910:1910 -> <init>
     1:1:void add(java.lang.Object):1928:1928 -> add
     1:1:java.lang.Object next():1913:1913 -> next
     1:1:java.lang.Object previous():1918:1918 -> previous
     1:1:void set(java.lang.Object):1923:1923 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$TreeIterator -> com.android.tools.r8.internal.vV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$TreeIterator -> com.android.tools.r8.internal.yV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry prev -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry curr -> c
@@ -95899,14 +96010,14 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$TreeIter
     1:1:void updatePrevious():1076:1076 -> o
     1:1:int previousIndex():1092:1092 -> previousIndex
     1:12:void remove():1096:1096 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator -> com.android.tools.r8.internal.wV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator -> com.android.tools.r8.internal.zV0:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1348:1348 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1348:1348 -> <init>
     1:1:void add(java.lang.Object):1366:1366 -> add
     1:1:java.lang.Object next():1351:1351 -> next
     1:1:java.lang.Object previous():1356:1356 -> previous
     1:1:void set(java.lang.Object):1361:1361 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap -> com.android.tools.r8.internal.BV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap -> com.android.tools.r8.internal.EV0:
     java.lang.Object[] value -> c
     int[] key -> b
     int size -> d
@@ -95934,8 +96045,8 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap -> com.and
     1:8:java.lang.Object remove(int):308:315 -> remove
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():326:326 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$1 -> com.android.tools.r8.internal.yV0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet -> com.android.tools.r8.internal.AV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$1 -> com.android.tools.r8.internal.BV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet -> com.android.tools.r8.internal.DV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$1):133:133 -> <init>
@@ -95945,7 +96056,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet -
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1 -> com.android.tools.r8.internal.zV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1 -> com.android.tools.r8.internal.CV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -95954,18 +96065,18 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunction -> com.android.tools.r8.internal.CV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunction -> com.android.tools.r8.internal.FV0:
     boolean containsKey(int) -> a
     java.lang.Object put(int,java.lang.Object) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap -> com.android.tools.r8.internal.FV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap -> com.android.tools.r8.internal.IV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry -> com.android.tools.r8.internal.DV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry -> com.android.tools.r8.internal.GV0:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.EV0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.internal.HV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.HV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.internal.KV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap EMPTY_MAP -> a
     1:1:void <clinit>():124:124 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap -> com.android.tools.r8.internal.GV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap -> com.android.tools.r8.internal.JV0:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunctions$EmptyFunction.<init>():41:41 -> <init>
     1:1:void <init>():46 -> <init>
     boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunctions$EmptyFunction.containsKey(int) -> a
@@ -95988,7 +96099,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap -> co
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():86:86 -> values
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap.values():86:86 -> values
     2:2:java.util.Collection values():43 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap -> com.android.tools.r8.internal.QV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap -> com.android.tools.r8.internal.TV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet entries -> j
     java.lang.Object[] value -> c
     float f -> i
@@ -96048,14 +96159,14 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap -> com.
     1:12:java.lang.Object remove(int):309:320 -> remove
     1:1:int size():386:386 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():794:815 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.IV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.LV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):794:794 -> <init>
     1:1:void clear():812:812 -> clear
     1:1:boolean contains(java.lang.Object):807:807 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():797:797 -> iterator
     1:1:int size():802:802 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.JV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.MV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):600:600 -> <init>
@@ -96063,13 +96174,13 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIt
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator.next():605:605 -> next
     1:1:java.lang.Object next():600 -> next
     1:2:void remove():610:611 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.KV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.NV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):721:722 -> <init>
     1:1:int nextInt():727:727 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator.next():733:733 -> next
     1:1:java.lang.Object next():720 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.LV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.OV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):737:737 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1):737:737 -> <init>
@@ -96078,7 +96189,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     1:3:boolean remove(int):755:757 -> remove
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.MV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.PV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,int):430:431 -> <init>
@@ -96090,7 +96201,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntr
     1:1:int hashCode():476:476 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):449:450 -> setValue
     1:1:java.lang.String toString():481:481 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.NV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.QV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):625:625 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1):625:625 -> <init>
@@ -96099,7 +96210,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntr
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():627:627 -> iterator
     1:29:boolean remove(java.lang.Object):659:687 -> remove
     1:1:int size():696:696 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.OV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.RV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> e
     int last -> b
     int pos -> a
@@ -96117,11 +96228,11 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapIter
     15:24:void remove():580 -> remove
     25:26:void remove():583:584 -> remove
     27:27:void remove():576:576 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.PV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.SV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):782:783 -> <init>
     1:1:java.lang.Object next():788:788 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap -> com.android.tools.r8.internal.jW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap -> com.android.tools.r8.internal.mW0:
     boolean[] dirPath -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry tree -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
@@ -96243,8 +96354,8 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap -> com.an
     256:272:java.lang.Object remove(int):457:473 -> remove
     1:1:int size():951:951 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1348:1369 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1 -> com.android.tools.r8.internal.RV0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.TV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1 -> com.android.tools.r8.internal.UV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.WV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> b
     java.util.Comparator comparator -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1127:1128 -> <init>
@@ -96267,20 +96378,20 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 -> com.
     1:1:java.util.SortedSet tailSet(java.lang.Object):1127:1127 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1202:1202 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1127 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2$1 -> com.android.tools.r8.internal.SV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2$1 -> com.android.tools.r8.internal.VV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2):1128:1128 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1128:1128 -> compare
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2$1.compare(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1130:1130 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1128 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$3 -> com.android.tools.r8.internal.UV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$3 -> com.android.tools.r8.internal.XV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1348:1348 -> <init>
     1:1:void clear():1366:1366 -> clear
     1:1:boolean contains(java.lang.Object):1356:1356 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1351:1351 -> iterator
     1:1:int size():1361:1361 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.VV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.YV0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry right -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry left -> c
     int info -> e
@@ -96307,7 +96418,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry ->
     1:1:boolean succ():770:770 -> i
     1:2:java.lang.Object setValue(java.lang.Object):889:890 -> setValue
     1:1:java.lang.String toString():924:924 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.WV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.ZV0:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1097:1097 -> <init>
     1:1:void add(java.lang.Object):1096:1096 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1121:1121 -> add
@@ -96319,7 +96430,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIter
     1:1:void set(java.lang.Object):1096:1096 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1116:1116 -> set
     2:2:void set(java.lang.Object):1096 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.XV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.aW0:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1219:1219 -> <init>
     1:1:void add(java.lang.Object):1218:1218 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator.add(java.lang.Integer):1267:1267 -> add
@@ -96333,12 +96444,12 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterat
     1:1:void set(java.lang.Object):1218:1218 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator.set(java.lang.Integer):1261:1261 -> set
     2:2:void set(java.lang.Object):1218 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.YV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.bW0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1274:1274 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1274:1274 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1276:1276 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.gW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.jW0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> i
@@ -96406,7 +96517,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap ->
     1:4:java.lang.Object remove(int):1622:1625 -> remove
     1:5:int size():1630:1634 -> size
     1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1566:1583 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.ZV0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.cW0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1465:1465 -> <init>
     1:1:void clear():1517:1517 -> clear
@@ -96436,19 +96547,19 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$1
     1:1:java.util.SortedSet tailSet(java.lang.Object):1465:1465 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$1.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1542:1542 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1465 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.aW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.dW0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1566:1566 -> <init>
     1:1:void clear():1580:1580 -> clear
     1:1:boolean contains(java.lang.Object):1572:1572 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1568:1568 -> iterator
     1:1:int size():1576:1576 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.bW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.eW0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1548:1548 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1548:1548 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1550:1550 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.cW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.fW0:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1773:1773 -> <init>
     1:1:void add(java.lang.Object):1772:1772 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1797:1797 -> add
@@ -96460,7 +96571,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$Su
     1:1:void set(java.lang.Object):1772:1772 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1792:1792 -> set
     2:2:void set(java.lang.Object):1772 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.dW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.gW0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1742:1743 -> <init>
     1:2:void updateNext():1767:1768 -> n
@@ -96471,7 +96582,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$Su
     3:3:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):234:234 -> o
     3:3:void updatePrevious():1763 -> o
     4:4:void updatePrevious():1763:1763 -> o
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.eW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.hW0:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1813:1813 -> <init>
     1:1:void add(java.lang.Object):1811:1811 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator.add(java.lang.Integer):1861:1861 -> add
@@ -96485,14 +96596,14 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$Su
     1:1:void set(java.lang.Object):1811:1811 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator.set(java.lang.Integer):1855:1855 -> set
     2:2:void set(java.lang.Object):1811 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.fW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.iW0:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1875:1875 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1875:1875 -> <init>
     1:1:void add(java.lang.Object):1893:1893 -> add
     1:1:java.lang.Object next():1878:1878 -> next
     1:1:java.lang.Object previous():1883:1883 -> previous
     1:1:void set(java.lang.Object):1888:1888 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.hW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.kW0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry prev -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry curr -> c
@@ -96509,14 +96620,14 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$TreeItera
     1:1:void updatePrevious():1042:1042 -> o
     1:1:int previousIndex():1058:1058 -> previousIndex
     1:12:void remove():1062:1062 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.iW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.lW0:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1312:1312 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1312:1312 -> <init>
     1:1:void add(java.lang.Object):1330:1330 -> add
     1:1:java.lang.Object next():1315:1315 -> next
     1:1:java.lang.Object previous():1320:1320 -> previous
     1:1:void set(java.lang.Object):1325:1325 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.android.tools.r8.internal.kW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.android.tools.r8.internal.nW0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet() -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int) -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(java.lang.Integer,java.lang.Integer) -> a
@@ -96526,10 +96637,10 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.an
     int firstIntKey() -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int) -> c
     int lastIntKey() -> h
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.internal.mW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.internal.pW0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap EMPTY_MAP -> a
     1:1:void <clinit>():185:185 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap -> com.android.tools.r8.internal.lW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap -> com.android.tools.r8.internal.oW0:
     1:1:void <init>():60:60 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():57:57 -> a
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():71:71 -> a
@@ -96554,7 +96665,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySor
     2:2:java.lang.Integer lastKey():177:177 -> lastKey
     1:1:java.util.SortedMap subMap(java.lang.Object,java.lang.Object):57:57 -> subMap
     1:1:java.util.SortedMap tailMap(java.lang.Object):57:57 -> tailMap
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tools.r8.internal.oW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tools.r8.internal.rW0:
     int size -> b
     1:3:void <init>(int):81:83 -> <init>
     4:4:void <init>(int):82:82 -> <init>
@@ -96596,7 +96707,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tool
     6:6:void grow(int):250:250 -> m
     1:6:boolean removeAll(java.util.Collection):482:487 -> removeAll
     1:1:int size():327:327 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.internal.nW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.internal.qW0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList this$0 -> c
     int last -> b
     int pos -> a
@@ -96610,7 +96721,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.to
     1:1:int nextIndex():516:516 -> nextIndex
     1:1:int previousIndex():520:520 -> previousIndex
     1:10:void remove():534:534 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.internal.qW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.internal.tW0:
     int size -> b
     1:2:void <init>():55:56 -> <init>
     3:4:void <init>(int):65:66 -> <init>
@@ -96633,25 +96744,25 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools
     2:2:java.util.Iterator iterator():29 -> iterator
     1:6:boolean remove(int):153:158 -> remove
     1:1:int size():148:148 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet$1 -> com.android.tools.r8.internal.pW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet$1 -> com.android.tools.r8.internal.sW0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet this$0 -> b
     int next -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet):119:120 -> <init>
     1:1:boolean hasNext():124:124 -> hasNext
     1:3:int nextInt():129:129 -> j
     1:2:void remove():135:136 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.internal.rW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.internal.uW0:
     int[] EMPTY_ARRAY -> a
     1:1:void <clinit>():100:100 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator -> com.android.tools.r8.internal.sW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator -> com.android.tools.r8.internal.vW0:
     int previousInt() -> d
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.internal.uW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.internal.xW0:
     boolean add(int) -> a
     boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection) -> a
     boolean contains(int) -> d
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.internal.xW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.internal.AW0:
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):536:536 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$EmptyCollection -> com.android.tools.r8.internal.vW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$EmptyCollection -> com.android.tools.r8.internal.yW0:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):96:96 -> a
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
@@ -96662,7 +96773,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$EmptyCollection -
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$UnmodifiableCollection -> com.android.tools.r8.internal.wW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$UnmodifiableCollection -> com.android.tools.r8.internal.zW0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):369:371 -> <init>
     1:1:boolean add(java.lang.Object):365:365 -> add
@@ -96672,6 +96783,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$UnmodifiableColle
     1:1:void clear():417:417 -> clear
     1:1:boolean contains(java.lang.Object):459:459 -> contains
     1:1:boolean containsAll(java.util.Collection):432:432 -> containsAll
+    1:1:boolean contains(int):396:396 -> d
     1:1:boolean equals(java.lang.Object):523:523 -> equals
     1:1:int hashCode():517:517 -> hashCode
     1:1:boolean isEmpty():391:391 -> isEmpty
@@ -96686,23 +96798,23 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$UnmodifiableColle
     1:1:java.lang.Object[] toArray(java.lang.Object[]):422:422 -> toArray
     2:2:java.lang.Object[] toArray():427:427 -> toArray
     1:1:java.lang.String toString():512:512 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator -> com.android.tools.r8.internal.yW0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.internal.AW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator -> com.android.tools.r8.internal.BW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.internal.DW0:
     int nextInt() -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.internal.DW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.internal.GW0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator EMPTY_ITERATOR -> a
     1:1:void <clinit>():103:103 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.internal.BW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.internal.EW0:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():87:87 -> clone
     1:1:int previousInt():62:62 -> d
     1:1:int nextInt():57:57 -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.internal.CW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.internal.FW0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator i -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator):807:808 -> <init>
     1:1:boolean hasNext():813:813 -> hasNext
     1:1:int nextInt():818:818 -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.internal.EW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.internal.HW0:
     boolean add(int) -> a
     void getElements(int,int[],int,int) -> a
     void removeElements(int,int) -> a
@@ -96710,8 +96822,8 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.
     int set(int,int) -> c
     int removeInt(int) -> e
     int getInt(int) -> f
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.internal.FW0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.internal.NW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.internal.IW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.internal.QW0:
     float f -> g
     int size -> f
     int n -> d
@@ -96764,8 +96876,8 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.to
     2:5:boolean remove(int):365 -> remove
     6:13:boolean remove(int):369:376 -> remove
     1:1:int size():412:412 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$1 -> com.android.tools.r8.internal.LW0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.internal.MW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$1 -> com.android.tools.r8.internal.OW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.internal.PW0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet this$0 -> f
     int last -> b
@@ -96783,21 +96895,21 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> co
     14:22:void remove():532 -> remove
     23:24:void remove():535:536 -> remove
     25:25:void remove():528:528 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.internal.RW0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.internal.TW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.internal.UW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.internal.WW0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():76:76 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet -> com.android.tools.r8.internal.SW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet -> com.android.tools.r8.internal.VW0:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():52:52 -> clone
     1:1:boolean equals(java.lang.Object):58:58 -> equals
     1:1:boolean rem(int):64:64 -> g
     1:1:boolean remove(int):47:47 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.internal.UW0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.internal.WW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.internal.XW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.internal.ZW0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():168:168 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet -> com.android.tools.r8.internal.VW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet -> com.android.tools.r8.internal.YW0:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():155:155 -> clone
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet.first():139:139 -> first
@@ -96813,7 +96925,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet -> com.an
     1:1:java.util.SortedSet tailSet(java.lang.Object):39:39 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet.tailSet(java.lang.Integer):128:128 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):39 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntStack -> com.android.tools.r8.internal.XW0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntStack -> com.android.tools.r8.internal.aX0:
 com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceMap -> com.android.tools.r8.internal.P:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
@@ -97052,9 +97164,9 @@ com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongSet -> com.android.
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet.size():745:745 -> hashCode
     2:2:int hashCode():57 -> hashCode
     3:8:int hashCode():58:63 -> hashCode
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.internal.J51:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.K51:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.internal.T51:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.internal.M51:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.N51:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.internal.W51:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> j
     java.lang.Object[] value -> b
     long[] key -> a
@@ -97111,14 +97223,14 @@ com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> co
     1:1:int size():386:386 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.values():794:815 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.L51:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.O51:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):794:794 -> <init>
     1:1:void clear():812:812 -> clear
     1:1:boolean contains(java.lang.Object):807:807 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():797:797 -> iterator
     1:1:int size():802:802 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.M51:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.P51:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):600:600 -> <init>
@@ -97126,13 +97238,13 @@ com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$Entry
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator.next():605:605 -> next
     1:1:java.lang.Object next():600 -> next
     1:2:void remove():610:611 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.N51:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Q51:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):721:722 -> <init>
     1:1:long nextLong():727:727 -> a
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator.next():733:733 -> next
     1:1:java.lang.Object next():720 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.O51:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.R51:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):737:737 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1):737:737 -> <init>
@@ -97140,7 +97252,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySe
     1:1:boolean contains(long):750:750 -> b
     1:1:void clear():762:762 -> clear
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.P51:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.S51:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,int):430:431 -> <init>
@@ -97151,7 +97263,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEn
     1:1:int hashCode():476:476 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):449:450 -> setValue
     1:1:java.lang.String toString():481:481 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Q51:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.T51:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):625:625 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1):625:625 -> <init>
@@ -97160,7 +97272,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEn
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():627:627 -> iterator
     1:29:boolean remove(java.lang.Object):659:687 -> remove
     1:1:int size():696:696 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.R51:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.U51:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList wrapped -> e
     int last -> b
@@ -97178,11 +97290,11 @@ com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIt
     15:24:void remove():580 -> remove
     25:26:void remove():583:584 -> remove
     27:27:void remove():576:576 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.S51:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.V51:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):782:783 -> <init>
     1:1:java.lang.Object next():788:788 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.internal.V51:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.internal.Y51:
     int size -> b
     1:3:void <init>(int):81:83 -> <init>
     4:4:void <init>(int):82:82 -> <init>
@@ -97208,7 +97320,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.to
     1:2:java.util.ListIterator listIterator(int):48 -> listIterator
     1:6:boolean removeAll(java.util.Collection):482:487 -> removeAll
     1:1:int size():327:327 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.internal.U51:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.internal.X51:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList this$0 -> c
     int last -> b
     int pos -> a
@@ -97222,18 +97334,18 @@ com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.
     1:1:int nextIndex():516:516 -> nextIndex
     1:1:int previousIndex():520:520 -> previousIndex
     1:10:void remove():534:534 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.internal.W51:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.internal.Z51:
     long previousLong() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.internal.X51:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.internal.Z51:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.internal.a61:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.internal.c61:
     long nextLong() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.internal.a61:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.internal.d61:
     void add(int,long) -> a
     void removeElements(int,int) -> a
     long getLong(int) -> b
     long set(int,long) -> b
     long removeLong(int) -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.internal.e61:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.internal.h61:
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap -> com.android.tools.r8.internal.F0:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
@@ -97875,7 +97987,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSet -> com.a
     1:7:int hashCode():57:63 -> hashCode
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSortedSet -> com.android.tools.r8.internal.k1:
     1:1:void <init>():23:23 -> <init>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.internal.Va1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.internal.Ya1:
     java.lang.Object[] key -> a
     boolean[] value -> b
     int size -> c
@@ -97903,8 +98015,8 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap.values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$1 -> com.android.tools.r8.internal.Sa1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.internal.Ua1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$1 -> com.android.tools.r8.internal.Va1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.internal.Xa1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$1):133:133 -> <init>
@@ -97914,7 +98026,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntryS
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Ta1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Wa1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -97923,7 +98035,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntryS
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.internal.Za1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.internal.cb1:
     java.lang.Object[] key -> b
     int[] value -> c
     int size -> d
@@ -97953,8 +98065,8 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.and
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap.values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1 -> com.android.tools.r8.internal.Wa1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.internal.Ya1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1 -> com.android.tools.r8.internal.Za1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.internal.bb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1):133:133 -> <init>
@@ -97964,7 +98076,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Xa1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.ab1:
     int next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet this$1 -> c
     int curr -> a
@@ -97973,10 +98085,10 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.internal.ab1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.internal.db1:
     int getInt(java.lang.Object) -> a
     int put(java.lang.Object,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.internal.jb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.internal.mb1:
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> n
     int maxFill -> j
@@ -98049,14 +98161,14 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -
     1:1:java.util.SortedMap tailMap(java.lang.Object):87 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.values():1596:1617 -> values
     1:22:java.util.Collection values():87 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.bb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.eb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1596:1596 -> <init>
     1:1:void clear():1614:1614 -> clear
     1:1:boolean contains(int):1609:1609 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     1:1:int size():1604:1604 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.cb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.fb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry entry -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1222:1222 -> <init>
@@ -98071,14 +98183,14 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$E
     1:1:void set(java.lang.Object):1219:1219 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry):1211:1211 -> set
     2:2:void set(java.lang.Object):1219 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.db1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.gb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1455:1456 -> <init>
     1:1:void add(java.lang.Object):1452:1452 -> add
     1:1:java.lang.Object next():1461:1461 -> next
     1:1:java.lang.Object previous():1442:1442 -> previous
     1:1:void set(java.lang.Object):1447:1447 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.eb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.hb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1465:1465 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1):1465:1465 -> <init>
@@ -98098,7 +98210,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$K
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1465 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet.tailSet(java.lang.Object):1515:1515 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):1465 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.fb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.ib1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,int):824:825 -> <init>
@@ -98117,7 +98229,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$M
     5:5:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry.setValue(java.lang.Integer):869:869 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):819 -> setValue
     1:1:java.lang.String toString():887:887 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.gb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.jb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1269:1269 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1):1269:1269 -> <init>
@@ -98139,7 +98251,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$M
     1:1:java.util.SortedSet tailSet(java.lang.Object):1269:1269 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry):1291:1291 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1269 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.hb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.kb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -98157,7 +98269,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$M
     1:2:int previousIndex():1122:1123 -> previousIndex
     1:47:void remove():1145:1191 -> remove
     48:48:void remove():1146:1146 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.ib1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.lb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1578:1579 -> <init>
     1:1:void add(java.lang.Object):1544:1544 -> add
@@ -98172,11 +98284,11 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$V
     1:1:void set(java.lang.Object):1544:1544 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator.set(java.lang.Integer):1559:1559 -> set
     2:2:void set(java.lang.Object):1544 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap -> com.android.tools.r8.internal.mb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap -> com.android.tools.r8.internal.pb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet() -> g
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.internal.kb1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.internal.lb1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.internal.vb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.internal.nb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.internal.ob1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.internal.yb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keys -> j
     java.lang.Object[] key -> b
     int[] value -> c
@@ -98235,14 +98347,14 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1 -> com.android.tools.r8.internal.nb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1 -> com.android.tools.r8.internal.qb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):848:848 -> <init>
     1:1:void clear():866:866 -> clear
     1:1:boolean contains(int):861:861 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():851:851 -> iterator
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.ob1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.rb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):654:654 -> <init>
@@ -98250,11 +98362,11 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIt
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIterator.next():659:659 -> next
     1:1:java.lang.Object next():654 -> next
     1:2:void remove():664:665 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.pb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.sb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.qb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.tb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1):785:785 -> <init>
@@ -98263,7 +98375,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeySet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
     1:3:boolean remove(java.lang.Object):803:805 -> remove
     1:1:int size():793:793 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.rb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.ub1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,int):473:474 -> <init>
@@ -98282,7 +98394,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntr
     5:5:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry.setValue(java.lang.Integer):518:518 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):468 -> setValue
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.sb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.vb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1):679:679 -> <init>
@@ -98291,7 +98403,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntr
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
     1:29:boolean remove(java.lang.Object):713:741 -> remove
     1:1:int size():750:750 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.tb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.wb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList wrapped -> e
     int last -> b
@@ -98309,16 +98421,16 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapIter
     14:23:void remove():634 -> remove
     24:25:void remove():637:638 -> remove
     26:26:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.ub1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.xb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):830:831 -> <init>
     1:1:int nextInt():836:836 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator.next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.wb1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.internal.xb1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.internal.yb1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.internal.Hb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.zb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.internal.Ab1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.internal.Bb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.internal.Kb1:
     java.lang.Object[] key -> a
     long[] value -> b
     int maxFill -> f
@@ -98377,14 +98489,14 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1 -> com.android.tools.r8.internal.zb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1 -> com.android.tools.r8.internal.Cb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):848:848 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():851:851 -> a
     1:1:boolean contains(long):861:861 -> b
     1:1:void clear():866:866 -> clear
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Ab1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Db1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):654:654 -> <init>
@@ -98392,11 +98504,11 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryI
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator.next():659:659 -> next
     1:1:java.lang.Object next():654 -> next
     1:2:void remove():664:665 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Bb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Eb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.Cb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.Fb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1):785:785 -> <init>
@@ -98405,7 +98517,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeySet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
     1:3:boolean remove(java.lang.Object):803:805 -> remove
     1:1:int size():793:793 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.Db1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.Gb1:
     int index -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,int):473:474 -> <init>
@@ -98424,7 +98536,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEnt
     5:5:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry.setValue(java.lang.Long):518:518 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):468 -> setValue
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Eb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Hb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1):679:679 -> <init>
@@ -98433,7 +98545,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEnt
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
     1:29:boolean remove(java.lang.Object):713:741 -> remove
     1:1:int size():750:750 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.Fb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.Ib1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList wrapped -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> f
     int last -> b
@@ -98451,13 +98563,13 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapIte
     14:23:void remove():634 -> remove
     24:25:void remove():637:638 -> remove
     26:26:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Gb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Jb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):830:831 -> <init>
     1:1:long nextLong():836:836 -> a
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator.next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.internal.Qb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.internal.Tb1:
     java.lang.Object[] value -> b
     int maxFill -> j
     java.lang.Object[] key -> a
@@ -98527,14 +98639,14 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustom
     1:1:java.util.SortedMap tailMap(java.lang.Object):85 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.values():1529:1550 -> values
     1:22:java.util.Collection values():85 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.internal.Ib1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.internal.Lb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1529:1529 -> <init>
     1:1:void clear():1547:1547 -> clear
     1:1:boolean contains(java.lang.Object):1542:1542 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1532:1532 -> iterator
     1:1:int size():1537:1537 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.internal.Jb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.internal.Mb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry entry -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1181:1181 -> <init>
@@ -98549,14 +98661,14 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustom
     1:1:void set(java.lang.Object):1178:1178 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):1170:1170 -> set
     2:2:void set(java.lang.Object):1178 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeyIterator -> com.android.tools.r8.internal.Kb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeyIterator -> com.android.tools.r8.internal.Nb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1412:1413 -> <init>
     1:1:void add(java.lang.Object):1409:1409 -> add
     1:1:java.lang.Object next():1418:1418 -> next
     1:1:java.lang.Object previous():1399:1399 -> previous
     1:1:void set(java.lang.Object):1404:1404 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.internal.Lb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.internal.Ob1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1422:1422 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1):1422:1422 -> <init>
@@ -98576,7 +98688,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustom
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1422 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet.tailSet(java.lang.Object):1472:1472 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):1422 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry -> com.android.tools.r8.internal.Mb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry -> com.android.tools.r8.internal.Pb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,int):805:806 -> <init>
@@ -98586,7 +98698,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustom
     1:1:int hashCode():839:839 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):824:825 -> setValue
     1:1:java.lang.String toString():844:844 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet -> com.android.tools.r8.internal.Nb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet -> com.android.tools.r8.internal.Qb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1228:1228 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1):1228:1228 -> <init>
@@ -98608,7 +98720,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustom
     1:1:java.util.SortedSet tailSet(java.lang.Object):1228:1228 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):1250:1250 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1228 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator -> com.android.tools.r8.internal.Ob1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator -> com.android.tools.r8.internal.Rb1:
     int index -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> e
     int next -> b
@@ -98626,17 +98738,17 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustom
     1:2:int previousIndex():1079:1080 -> previousIndex
     1:49:void remove():1102:1150 -> remove
     50:50:void remove():1103:1103 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.internal.Pb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.internal.Sb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1517:1518 -> <init>
     1:1:void add(java.lang.Object):1514:1514 -> add
     1:1:java.lang.Object next():1523:1523 -> next
     1:1:java.lang.Object previous():1504:1504 -> previous
     1:1:void set(java.lang.Object):1509:1509 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap -> com.android.tools.r8.internal.Sb1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.internal.Rb1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Tb1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.cc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap -> com.android.tools.r8.internal.Vb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.internal.Ub1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Wb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.fc1:
     java.lang.Object[] key -> b
     java.lang.Object[] value -> c
     int maxFill -> j
@@ -98708,14 +98820,14 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHas
     1:1:java.util.SortedMap tailMap(java.lang.Object):85 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.values():1498:1519 -> values
     1:22:java.util.Collection values():85 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.Ub1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.Xb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1498:1498 -> <init>
     1:1:void clear():1516:1516 -> clear
     1:1:boolean contains(java.lang.Object):1511:1511 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1501:1501 -> iterator
     1:1:int size():1506:1506 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Vb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Yb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry entry -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1150:1150 -> <init>
@@ -98730,14 +98842,14 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHas
     1:1:void set(java.lang.Object):1147:1147 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1139:1139 -> set
     2:2:void set(java.lang.Object):1147 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Wb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Zb1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1381:1382 -> <init>
     1:1:void add(java.lang.Object):1378:1378 -> add
     1:1:java.lang.Object next():1387:1387 -> next
     1:1:java.lang.Object previous():1368:1368 -> previous
     1:1:void set(java.lang.Object):1373:1373 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Xb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.ac1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1391:1391 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1):1391:1391 -> <init>
@@ -98757,7 +98869,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHas
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1391 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeySet.tailSet(java.lang.Object):1441:1441 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):1391 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.Yb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.bc1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,int):774:775 -> <init>
@@ -98767,7 +98879,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHas
     1:1:int hashCode():808:808 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):793:794 -> setValue
     1:1:java.lang.String toString():813:813 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Zb1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.cc1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1197:1197 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1):1197:1197 -> <init>
@@ -98789,7 +98901,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHas
     1:1:java.util.SortedSet tailSet(java.lang.Object):1197:1197 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntrySet.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1219:1219 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1197 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.ac1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.dc1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -98807,16 +98919,16 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHas
     1:2:int previousIndex():1048:1049 -> previousIndex
     1:49:void remove():1071:1119 -> remove
     50:50:void remove():1072:1072 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.bc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.ec1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1486:1487 -> <init>
     1:1:void add(java.lang.Object):1483:1483 -> add
     1:1:java.lang.Object next():1492:1492 -> next
     1:1:java.lang.Object previous():1473:1473 -> previous
     1:1:void set(java.lang.Object):1478:1478 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap -> com.android.tools.r8.internal.ec1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry -> com.android.tools.r8.internal.dc1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap -> com.android.tools.r8.internal.wc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap -> com.android.tools.r8.internal.hc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry -> com.android.tools.r8.internal.gc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap -> com.android.tools.r8.internal.zc1:
     boolean[] dirPath -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry[] nodePath -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
@@ -98939,7 +99051,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap ->
     1:1:int size():939:939 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.values():1311:1332 -> values
     1:22:java.util.Collection values():43 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1 -> com.android.tools.r8.internal.gc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1 -> com.android.tools.r8.internal.jc1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> b
     java.util.Comparator comparator -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1116:1117 -> <init>
@@ -98962,20 +99074,20 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1 -
     1:1:java.util.SortedSet tailSet(java.lang.Object):1116:1116 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1189:1189 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1116 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1$1 -> com.android.tools.r8.internal.fc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1$1 -> com.android.tools.r8.internal.ic1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1 this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1):1117:1117 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1117:1117 -> compare
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1$1.compare(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1119:1119 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1117 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.hc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.kc1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1311:1311 -> <init>
     1:1:void clear():1329:1329 -> clear
     1:1:boolean contains(java.lang.Object):1319:1319 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1314:1314 -> iterator
     1:1:int size():1324:1324 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.ic1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.lc1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry right -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry left -> c
     int info -> e
@@ -99002,7 +99114,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Ent
     1:1:boolean succ():757:757 -> i
     1:2:java.lang.Object setValue(java.lang.Object):876:877 -> setValue
     1:1:java.lang.String toString():911:911 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.jc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.mc1:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1086:1086 -> <init>
     1:1:void add(java.lang.Object):1085:1085 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$EntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1110:1110 -> add
@@ -99014,18 +99126,18 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Ent
     1:1:void set(java.lang.Object):1085:1085 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$EntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1105:1105 -> set
     2:2:void set(java.lang.Object):1085 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.kc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.nc1:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1206:1206 -> <init>
     1:1:void add(java.lang.Object):1230:1230 -> add
     1:1:java.lang.Object next():1215:1215 -> next
     1:1:java.lang.Object previous():1220:1220 -> previous
     1:1:void set(java.lang.Object):1225:1225 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.lc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.oc1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1237:1237 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1):1237:1237 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1239:1239 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.tc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.wc1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keys -> g
@@ -99093,7 +99205,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Sub
     1:5:int size():1591:1595 -> size
     1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap.values():1527:1544 -> values
     1:18:java.util.Collection values():1366 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.mc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.pc1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1428:1428 -> <init>
     1:1:void clear():1478:1478 -> clear
@@ -99123,19 +99235,19 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Sub
     1:1:java.util.SortedSet tailSet(java.lang.Object):1428:1428 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$1.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1503:1503 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1428 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.nc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.qc1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1527:1527 -> <init>
     1:1:void clear():1541:1541 -> clear
     1:1:boolean contains(java.lang.Object):1533:1533 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1529:1529 -> iterator
     1:1:int size():1537:1537 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.oc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.rc1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1509:1509 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1):1509:1509 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1511:1511 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.pc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.sc1:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1734:1734 -> <init>
     1:1:void add(java.lang.Object):1733:1733 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapEntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1758:1758 -> add
@@ -99147,7 +99259,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Sub
     1:1:void set(java.lang.Object):1733:1733 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapEntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1753:1753 -> set
     2:2:void set(java.lang.Object):1733 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.qc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.tc1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap this$1 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1703:1704 -> <init>
     1:2:void updateNext():1728:1729 -> n
@@ -99158,20 +99270,20 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Sub
     3:3:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> o
     3:3:void updatePrevious():1724 -> o
     4:4:void updatePrevious():1724:1724 -> o
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.rc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.uc1:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1774:1774 -> <init>
     1:1:void add(java.lang.Object):1798:1798 -> add
     1:1:java.lang.Object next():1783:1783 -> next
     1:1:java.lang.Object previous():1788:1788 -> previous
     1:1:void set(java.lang.Object):1793:1793 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.sc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.vc1:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1812:1812 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1):1812:1812 -> <init>
     1:1:void add(java.lang.Object):1830:1830 -> add
     1:1:java.lang.Object next():1815:1815 -> next
     1:1:java.lang.Object previous():1820:1820 -> previous
     1:1:void set(java.lang.Object):1825:1825 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.uc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.xc1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry prev -> a
@@ -99188,15 +99300,15 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Tre
     1:1:void updatePrevious():1031:1031 -> o
     1:1:int previousIndex():1047:1047 -> previousIndex
     1:12:void remove():1051:1051 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.vc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.yc1:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1275:1275 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1):1275:1275 -> <init>
     1:1:void add(java.lang.Object):1293:1293 -> add
     1:1:java.lang.Object next():1278:1278 -> next
     1:1:java.lang.Object previous():1283:1283 -> previous
     1:1:void set(java.lang.Object):1288:1288 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.xc1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.internal.Ec1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Ac1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.internal.Hc1:
     int size -> b
     1:3:void <init>(int):96:98 -> <init>
     4:4:void <init>(int):97:97 -> <init>
@@ -99219,7 +99331,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.androi
     1:7:boolean removeAll(java.util.Collection):485:491 -> removeAll
     1:4:java.lang.Object set(int,java.lang.Object):357:357 -> set
     1:1:int size():372:372 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.internal.Dc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.internal.Gc1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList this$0 -> c
     int last -> b
     int pos -> a
@@ -99233,7 +99345,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.andr
     1:1:int previousIndex():524:524 -> previousIndex
     1:10:void remove():538:538 -> remove
     1:3:void set(java.lang.Object):533:533 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.internal.Gc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.internal.Jc1:
     int size -> b
     1:4:void <init>(java.lang.Object[],int):104:107 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet):29:29 -> a
@@ -99253,20 +99365,20 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android
     2:2:java.util.Iterator iterator():29 -> iterator
     1:7:boolean remove(java.lang.Object):154:160 -> remove
     1:1:int size():149:149 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.internal.Fc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.internal.Ic1:
     int next -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet this$0 -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet):119:120 -> <init>
     1:1:boolean hasNext():124:124 -> hasNext
     1:3:java.lang.Object next():129:129 -> next
     1:3:void remove():135:137 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.internal.Hc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.internal.Kc1:
 # {"id":"sourceFile","fileName":"ObjectArrays.java"}
     java.lang.Object[] EMPTY_ARRAY -> a
     1:1:void <clinit>():88:88 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.internal.Jc1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.internal.Kc1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.internal.Lc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.internal.Mc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.internal.Nc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.internal.Oc1:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():38:38 -> iterator
@@ -99275,16 +99387,16 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollec
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.internal.Mc1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.internal.Qc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.internal.Pc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.internal.Tc1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator EMPTY_ITERATOR -> a
     1:1:void <clinit>():103:103 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator -> com.android.tools.r8.internal.Nc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator -> com.android.tools.r8.internal.Qc1:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():87:87 -> clone
     1:1:java.lang.Object next():57:57 -> next
     1:1:java.lang.Object previous():62:62 -> previous
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$SingletonIterator -> com.android.tools.r8.internal.Oc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$SingletonIterator -> com.android.tools.r8.internal.Rc1:
     java.lang.Object element -> a
     int curr -> b
     1:2:void <init>(java.lang.Object):127:128 -> <init>
@@ -99294,24 +99406,24 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$SingletonIter
     1:1:int nextIndex():157:157 -> nextIndex
     1:4:java.lang.Object previous():150:150 -> previous
     1:1:int previousIndex():162:162 -> previousIndex
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$UnmodifiableIterator -> com.android.tools.r8.internal.Pc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$UnmodifiableIterator -> com.android.tools.r8.internal.Sc1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator i -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator):739:740 -> <init>
     1:1:boolean hasNext():745:745 -> hasNext
     1:1:java.lang.Object next():750:750 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList -> com.android.tools.r8.internal.Rc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList -> com.android.tools.r8.internal.Uc1:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.internal.Sc1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.internal.Uc1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.internal.Xc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.internal.Vc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.internal.Xc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.internal.ad1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():70:70 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet -> com.android.tools.r8.internal.Vc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet -> com.android.tools.r8.internal.Yc1:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():52:52 -> clone
     1:1:boolean equals(java.lang.Object):58:58 -> equals
     1:1:boolean remove(java.lang.Object):47:47 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$Singleton -> com.android.tools.r8.internal.Wc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$Singleton -> com.android.tools.r8.internal.Zc1:
     java.lang.Object element -> a
     1:2:void <init>(java.lang.Object):96:97 -> <init>
     1:1:boolean addAll(java.util.Collection):122:122 -> addAll
@@ -99329,11 +99441,11 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$Singleton -> com.a
     1:1:boolean remove(java.lang.Object):107:107 -> remove
     1:1:boolean removeAll(java.util.Collection):127:127 -> removeAll
     1:1:boolean retainAll(java.util.Collection):132:132 -> retainAll
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet -> com.android.tools.r8.internal.Yc1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.internal.ad1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet -> com.android.tools.r8.internal.bd1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.internal.dd1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():114:114 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet -> com.android.tools.r8.internal.Zc1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet -> com.android.tools.r8.internal.cd1:
     1:1:void <init>():43:43 -> <init>
     1:1:java.lang.Object clone():101:101 -> clone
     1:1:java.lang.Object first():86:86 -> first
@@ -99344,18 +99456,18 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet ->
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):40 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet.tailSet(java.lang.Object):81:81 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):40 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunction -> com.android.tools.r8.internal.Ti1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunction -> com.android.tools.r8.internal.Ri1:
     boolean put(java.lang.Object,boolean) -> a
     boolean getBoolean(java.lang.Object) -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.internal.Wi1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.internal.Ui1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet() -> f
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.internal.Ui1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.internal.Vi1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps -> com.android.tools.r8.internal.Zi1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.internal.Si1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.internal.Ti1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps -> com.android.tools.r8.internal.Xi1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$EmptyMap EMPTY_MAP -> a
     1:1:void <clinit>():135:135 -> <clinit>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap singleton(java.lang.Object,boolean):260:260 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$EmptyMap -> com.android.tools.r8.internal.Xi1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$EmptyMap -> com.android.tools.r8.internal.Vi1:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$EmptyFunction.<init>():41:41 -> <init>
     1:1:void <init>():46 -> <init>
     boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$EmptyFunction.getBoolean(java.lang.Object) -> b
@@ -99379,7 +99491,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$EmptyMa
     1:1:java.lang.String toString():127:127 -> toString
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$EmptyMap.values():97:97 -> values
     1:1:java.util.Collection values():43 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$Singleton -> com.android.tools.r8.internal.Yi1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$Singleton -> com.android.tools.r8.internal.Wi1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entries -> c
@@ -99424,7 +99536,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$Singlet
     1:1:java.lang.String toString():240:240 -> toString
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$Singleton.values():215:216 -> values
     1:2:java.util.Collection values():157 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.internal.ij1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.internal.gj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> i
     java.lang.Object[] key -> a
@@ -99522,14 +99634,14 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap
       # {"id":"com.android.tools.r8.synthesized"}
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.values():803:824 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.internal.aj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.internal.Yi1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):803:803 -> <init>
     1:1:boolean contains(boolean):816:816 -> b
     1:1:void clear():821:821 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():806:806 -> iterator
     1:1:int size():811:811 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.internal.bj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Zi1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):609:609 -> <init>
@@ -99537,11 +99649,11 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator.next():614:614 -> next
     1:1:java.lang.Object next():609 -> next
     1:2:void remove():619:620 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.internal.cj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.internal.aj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):730:731 -> <init>
     1:1:java.lang.Object next():736:736 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.internal.dj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.internal.bj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):740:740 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1):740:740 -> <init>
@@ -99550,7 +99662,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():743:743 -> iterator
     1:3:boolean remove(java.lang.Object):758:760 -> remove
     1:1:int size():748:748 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.internal.ej1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.internal.cj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,int):428:429 -> <init>
@@ -99569,7 +99681,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$
     5:5:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry.setValue(java.lang.Boolean):473:473 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):423 -> setValue
     1:1:java.lang.String toString():491:491 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.fj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.dj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):634:634 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1):634:634 -> <init>
@@ -99578,7 +99690,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():636:636 -> iterator
     1:29:boolean remove(java.lang.Object):668:696 -> remove
     1:1:int size():705:705 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.internal.gj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.internal.ej1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
@@ -99596,13 +99708,13 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$
     14:23:void remove():589 -> remove
     24:25:void remove():592:593 -> remove
     26:26:void remove():585:585 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.internal.hj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.internal.fj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):785:786 -> <init>
     1:1:boolean nextBoolean():791:791 -> g
     1:1:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator.next():797:797 -> next
     1:1:java.lang.Object next():784 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.internal.mj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.internal.kj1:
     java.lang.Object[] key -> b
     int[] value -> c
     int size -> d
@@ -99630,8 +99742,8 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1 -> com.android.tools.r8.internal.jj1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.internal.lj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1 -> com.android.tools.r8.internal.hj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.internal.jj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1):133:133 -> <init>
@@ -99641,7 +99753,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySe
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.kj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.ij1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -99650,11 +99762,11 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySe
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.internal.nj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.internal.lj1:
     int getInt(java.lang.Object) -> a
     int put(java.lang.Object,int) -> a
     int removeInt(java.lang.Object) -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.internal.wj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.internal.uj1:
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> n
     int maxFill -> j
@@ -99726,14 +99838,14 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMa
     1:1:java.util.SortedMap tailMap(java.lang.Object):87 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.values():1596:1617 -> values
     1:22:java.util.Collection values():87 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.oj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.mj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1596:1596 -> <init>
     1:1:void clear():1614:1614 -> clear
     1:1:boolean contains(int):1609:1609 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     1:1:int size():1604:1604 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.pj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.nj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry entry -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1222:1222 -> <init>
@@ -99748,14 +99860,14 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMa
     1:1:void set(java.lang.Object):1219:1219 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry):1211:1211 -> set
     2:2:void set(java.lang.Object):1219 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.qj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.oj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1455:1456 -> <init>
     1:1:void add(java.lang.Object):1452:1452 -> add
     1:1:java.lang.Object next():1461:1461 -> next
     1:1:java.lang.Object previous():1442:1442 -> previous
     1:1:void set(java.lang.Object):1447:1447 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.rj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.pj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1465:1465 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1):1465:1465 -> <init>
@@ -99775,7 +99887,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMa
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1465 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet.tailSet(java.lang.Object):1515:1515 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):1465 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.sj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.qj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,int):824:825 -> <init>
@@ -99794,7 +99906,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMa
     5:5:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry.setValue(java.lang.Integer):869:869 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):819 -> setValue
     1:1:java.lang.String toString():887:887 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.tj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.rj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1269:1269 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1):1269:1269 -> <init>
@@ -99816,7 +99928,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMa
     1:1:java.util.SortedSet tailSet(java.lang.Object):1269:1269 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry):1291:1291 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1269 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.uj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.sj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -99834,7 +99946,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMa
     1:2:int previousIndex():1122:1123 -> previousIndex
     1:47:void remove():1145:1191 -> remove
     48:48:void remove():1146:1146 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.vj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.tj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1578:1579 -> <init>
     1:1:void add(java.lang.Object):1544:1544 -> add
@@ -99849,11 +99961,11 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMa
     1:1:void set(java.lang.Object):1544:1544 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator.set(java.lang.Integer):1559:1559 -> set
     2:2:void set(java.lang.Object):1544 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.internal.zj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.internal.xj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet() -> d
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.internal.xj1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.internal.yj1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.internal.Ij1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.internal.vj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.internal.wj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.internal.Gj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet entries -> i
     java.lang.Object[] key -> b
     int[] value -> c
@@ -99913,14 +100025,14 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> c
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.internal.Aj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.internal.yj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):848:848 -> <init>
     1:1:void clear():866:866 -> clear
     1:1:boolean contains(int):861:861 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():851:851 -> iterator
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Bj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.zj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):654:654 -> <init>
@@ -99928,11 +100040,11 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$Entr
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator.next():659:659 -> next
     1:1:java.lang.Object next():654 -> next
     1:2:void remove():664:665 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Cj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Aj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.Dj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.Bj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1):785:785 -> <init>
@@ -99941,7 +100053,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyS
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
     1:3:boolean remove(java.lang.Object):803:805 -> remove
     1:1:int size():793:793 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.Ej1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.Cj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,int):473:474 -> <init>
@@ -99960,7 +100072,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapE
     5:5:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry.setValue(java.lang.Integer):518:518 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):468 -> setValue
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Fj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Dj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1):679:679 -> <init>
@@ -99969,7 +100081,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapE
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
     1:29:boolean remove(java.lang.Object):713:741 -> remove
     1:1:int size():750:750 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.Gj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.Ej1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
@@ -99987,16 +100099,16 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapI
     14:23:void remove():634 -> remove
     24:25:void remove():637:638 -> remove
     26:26:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Hj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Fj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):830:831 -> <init>
     1:1:int nextInt():836:836 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator.next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Jj1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$Entry -> com.android.tools.r8.internal.Kj1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet -> com.android.tools.r8.internal.Lj1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.internal.Uj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Hj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$Entry -> com.android.tools.r8.internal.Ij1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet -> com.android.tools.r8.internal.Jj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.internal.Sj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> i
     java.lang.Object[] key -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet entries -> h
@@ -100053,14 +100165,14 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap ->
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1 -> com.android.tools.r8.internal.Mj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1 -> com.android.tools.r8.internal.Kj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):848:848 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():851:851 -> a
     1:1:boolean contains(long):861:861 -> b
     1:1:void clear():866:866 -> clear
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Nj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Lj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):654:654 -> <init>
@@ -100068,11 +100180,11 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$Ent
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$EntryIterator.next():659:659 -> next
     1:1:java.lang.Object next():654 -> next
     1:2:void remove():664:665 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Oj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Mj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.Pj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.Nj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1):785:785 -> <init>
@@ -100081,7 +100193,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$Key
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
     1:3:boolean remove(java.lang.Object):803:805 -> remove
     1:1:int size():793:793 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.Qj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.Oj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,int):473:474 -> <init>
@@ -100099,7 +100211,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$Map
     5:5:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry.setValue(java.lang.Long):518:518 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):468 -> setValue
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Rj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Pj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1):679:679 -> <init>
@@ -100108,7 +100220,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$Map
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
     1:29:boolean remove(java.lang.Object):713:741 -> remove
     1:1:int size():750:750 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.Sj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.Qj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
     int pos -> a
@@ -100126,13 +100238,13 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$Map
     14:23:void remove():634 -> remove
     24:25:void remove():637:638 -> remove
     26:26:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Tj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Rj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):830:831 -> <init>
     1:1:long nextLong():836:836 -> a
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$ValueIterator.next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.internal.Wj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.internal.Uj1:
     int size -> b
     1:3:void <init>(int):96:98 -> <init>
     4:4:void <init>(int):97:97 -> <init>
@@ -100155,7 +100267,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.and
     1:7:boolean removeAll(java.util.Collection):485:491 -> removeAll
     1:4:java.lang.Object set(int,java.lang.Object):357:357 -> set
     1:1:int size():372:372 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.internal.Vj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.internal.Tj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList this$0 -> c
     int last -> b
     int pos -> a
@@ -100169,7 +100281,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.a
     1:1:int previousIndex():524:524 -> previousIndex
     1:10:void remove():538:538 -> remove
     1:3:void set(java.lang.Object):533:533 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.internal.Yj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.internal.Wj1:
     int size -> b
     1:4:void <init>(java.lang.Object[],int):104:107 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet):29:29 -> a
@@ -100189,17 +100301,17 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.andr
     2:2:java.util.Iterator iterator():29 -> iterator
     1:7:boolean remove(java.lang.Object):154:160 -> remove
     1:1:int size():149:149 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.internal.Xj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.internal.Vj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet this$0 -> b
     int next -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet):119:120 -> <init>
     1:1:boolean hasNext():124:124 -> hasNext
     1:3:java.lang.Object next():129:129 -> next
     1:3:void remove():135:137 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.internal.Zj1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.internal.ck1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.internal.Xj1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.internal.ak1:
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):383:383 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.internal.ak1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.internal.Yj1:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():38:38 -> iterator
@@ -100207,7 +100319,7 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCol
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.internal.bk1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.internal.Zj1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):276:278 -> <init>
     1:1:boolean add(java.lang.Object):283:283 -> add
@@ -100229,9 +100341,9 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$Unmodifi
     1:1:java.lang.Object[] toArray(java.lang.Object[]):329:329 -> toArray
     2:2:java.lang.Object[] toArray():334:334 -> toArray
     1:1:java.lang.String toString():359:359 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.internal.dk1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.internal.bk1:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.internal.gk1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.internal.ek1:
     java.lang.Object[] key -> a
     float f -> g
     int size -> f
@@ -100278,8 +100390,8 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.a
     2:5:boolean remove(java.lang.Object):332 -> remove
     6:13:boolean remove(java.lang.Object):336:343 -> remove
     1:1:int size():380:380 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.internal.ek1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.internal.fk1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.internal.ck1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.internal.dk1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
@@ -100297,16 +100409,16 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetItera
     14:22:void remove():500 -> remove
     23:24:void remove():503:504 -> remove
     25:25:void remove():496:496 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.internal.hk1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.internal.kk1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.internal.fk1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.internal.ik1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():70:70 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet -> com.android.tools.r8.internal.ik1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet -> com.android.tools.r8.internal.gk1:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():52:52 -> clone
     1:1:boolean equals(java.lang.Object):58:58 -> equals
     1:1:boolean remove(java.lang.Object):47:47 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$Singleton -> com.android.tools.r8.internal.jk1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$Singleton -> com.android.tools.r8.internal.hk1:
     java.lang.Object element -> a
     1:2:void <init>(java.lang.Object):96:97 -> <init>
     1:1:boolean addAll(java.util.Collection):122:122 -> addAll
@@ -100324,8 +100436,8 @@ com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$Singleton -> co
     1:1:boolean remove(java.lang.Object):107:107 -> remove
     1:1:boolean removeAll(java.util.Collection):127:127 -> removeAll
     1:1:boolean retainAll(java.util.Collection):132:132 -> retainAll
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.internal.lk1:
-com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.internal.VC0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.internal.jk1:
+com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.internal.YC0:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> j
@@ -100368,7 +100480,7 @@ com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.internal.VC
     158:161:int compareMethodsThroughLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):293:296 -> a
     162:162:com.android.tools.r8.graph.DexType[] lambda$compareMethodsThroughLens$3(com.android.tools.r8.graph.DexMethod):294:294 -> a
     163:166:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):300:303 -> a
-    167:167:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
+    167:167:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
     167:167:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):303 -> a
     168:171:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):303:306 -> a
     172:180:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):305:313 -> a
@@ -100378,7 +100490,7 @@ com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.internal.VC
     196:199:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):394 -> a
     200:201:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):395:396 -> a
     202:210:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):406:414 -> a
-    211:211:boolean com.android.tools.r8.graph.DexEncodedMethod.isDeprecated():322:322 -> a
+    211:211:boolean com.android.tools.r8.graph.DexEncodedMethod.isDeprecated():264:264 -> a
     211:211:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):415 -> a
     212:216:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):418:422 -> a
     217:225:java.lang.String[] com.android.tools.r8.jar.CfApplicationWriter.getExceptions(com.android.tools.r8.graph.DexAnnotationSet):366:374 -> a
@@ -100425,14 +100537,14 @@ com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.internal.VC
     47:66:void writeApplication(com.android.tools.r8.ClassFileConsumer):148:167 -> b
     67:67:void lambda$writeClass$1(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.graph.ProgramMethod):261:261 -> b
     68:68:com.android.tools.r8.graph.DexString returnTypeThroughLens(com.android.tools.r8.graph.DexMethod):284:284 -> b
-com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.internal.UC0:
+com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.internal.XC0:
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visit(java.lang.String,boolean) -> a
-com.android.tools.r8.jetbrains.kotlin.DeprecationLevel$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.EK0:
+com.android.tools.r8.jetbrains.kotlin.DeprecationLevel$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.HK0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlin.Lazy -> com.android.tools.r8.internal.n41:
+com.android.tools.r8.jetbrains.kotlin.Lazy -> com.android.tools.r8.internal.q41:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
 com.android.tools.r8.jetbrains.kotlin.LazyKt -> com.android.tools.r8.jetbrains.kotlin.a:
     1:38:com.android.tools.r8.jetbrains.kotlin.Lazy com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyJVMKt.lazy(com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):0:37 -> a
@@ -100460,10 +100572,10 @@ com.android.tools.r8.jetbrains.kotlin.LazyKt -> com.android.tools.r8.jetbrains.k
       # {"id":"com.android.tools.r8.synthesized"}
 com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyKt -> com.android.tools.r8.jetbrains.kotlin.b:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
-com.android.tools.r8.jetbrains.kotlin.NoWhenBranchMatchedException -> com.android.tools.r8.internal.ha1:
+com.android.tools.r8.jetbrains.kotlin.NoWhenBranchMatchedException -> com.android.tools.r8.internal.ka1:
 # {"id":"sourceFile","fileName":"NoWhenBranchMatchedException.kt"}
     1:1:void <init>():9:9 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.internal.de1:
+com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.internal.ge1:
 # {"id":"sourceFile","fileName":"Tuples.kt"}
     java.lang.Object second -> b
     java.lang.Object first -> a
@@ -100495,21 +100607,21 @@ com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl -> com.android.tools.
     1:1:boolean isInitialized():82:82 -> toString
     1:1:java.lang.String toString():84 -> toString
     2:2:java.lang.String toString():84:84 -> toString
-com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.internal.Mr1:
+com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.internal.Er1:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
     com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE INSTANCE -> a
     1:1:void <clinit>():71:71 -> <clinit>
     1:1:void <init>():71:71 -> <init>
-com.android.tools.r8.jetbrains.kotlin.UninitializedPropertyAccessException -> com.android.tools.r8.internal.Qr1:
+com.android.tools.r8.jetbrains.kotlin.UninitializedPropertyAccessException -> com.android.tools.r8.internal.Ir1:
 # {"id":"sourceFile","fileName":"UninitializedPropertyAccessException.kt"}
     1:1:void <init>(java.lang.String):11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Unit -> com.android.tools.r8.internal.Ur1:
+com.android.tools.r8.jetbrains.kotlin.Unit -> com.android.tools.r8.internal.Mr1:
 # {"id":"sourceFile","fileName":"Unit.kt"}
     com.android.tools.r8.jetbrains.kotlin.Unit INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():22:22 -> <init>
     1:1:java.lang.String toString():23:23 -> toString
-com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl -> com.android.tools.r8.internal.is1:
+com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl -> com.android.tools.r8.internal.as1:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> a
     java.lang.Object _value -> b
@@ -100518,7 +100630,7 @@ com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl -> com.android.tools.r8.int
     1:1:boolean com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl.isInitialized():88:88 -> toString
     1:1:java.lang.String toString():90 -> toString
     2:2:java.lang.String toString():90:90 -> toString
-com.android.tools.r8.jetbrains.kotlin._Assertions -> com.android.tools.r8.internal.Su1:
+com.android.tools.r8.jetbrains.kotlin._Assertions -> com.android.tools.r8.internal.Lu1:
 # {"id":"sourceFile","fileName":"AssertionsJVM.kt"}
     boolean ENABLED -> a
     1:1:void <clinit>():14:14 -> <clinit>
@@ -100594,7 +100706,7 @@ com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$SubList -> com.an
     1:3:java.lang.Object get(int):46:48 -> get
     4:4:void com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion.checkElementIndex$kotlin_stdlib(int,int):108:108 -> get
     4:4:java.lang.Object get(int):46 -> get
-com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt -> com.android.tools.r8.internal.Xz0:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt -> com.android.tools.r8.internal.aA0:
     1:1:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.asList(java.lang.Object[]):0:0 -> a
     1:1:java.util.List asList(java.lang.Object[]):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
@@ -100634,9 +100746,9 @@ com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt -> com.android.tools.
     7:7:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.toList(int[]):9972:9972 -> b
     7:7:java.util.List toList(int[]):0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt__ArraysKt -> com.android.tools.r8.internal.Yz0:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt__ArraysKt -> com.android.tools.r8.internal.bA0:
 # {"id":"sourceFile","fileName":"Arrays.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3 -> com.android.tools.r8.internal.Zz0:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3 -> com.android.tools.r8.internal.cA0:
 # {"id":"sourceFile","fileName":"_ArraysJvm.kt"}
     int[] $this_asList -> b
     1:1:void <init>(int[]):168:168 -> <init>
@@ -100657,10 +100769,10 @@ com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$
     3:2136:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.lastIndexOf(int[],int):0:2133 -> lastIndexOf
     3:2136:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3.lastIndexOf(int):174 -> lastIndexOf
     3:2136:int lastIndexOf(java.lang.Object):168 -> lastIndexOf
-com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt -> com.android.tools.r8.internal.aA0:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt -> com.android.tools.r8.internal.dA0:
 # {"id":"sourceFile","fileName":"_Arrays.kt"}
     1:2:int indexOf(int[],int):1544:1545 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt -> com.android.tools.r8.internal.wI0:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt -> com.android.tools.r8.internal.zI0:
     1:142:boolean com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsKt.addAll(java.util.Collection,java.lang.Object[]):0:141 -> a
     1:142:boolean addAll(java.util.Collection,java.lang.Object[]):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
@@ -100753,28 +100865,28 @@ com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt -> com.android.t
     1:1:java.lang.Iterable com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.withIndex(java.lang.Iterable):1628:1628 -> d
     1:1:java.lang.Iterable withIndex(java.lang.Iterable):0 -> d
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt -> com.android.tools.r8.internal.xI0:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt -> com.android.tools.r8.internal.AI0:
 # {"id":"sourceFile","fileName":"Collections.kt"}
     1:1:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsJVMKt.listOf(java.lang.Object):20:20 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IteratorsJVMKt -> com.android.tools.r8.internal.yI0:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IteratorsJVMKt -> com.android.tools.r8.internal.BI0:
 # {"id":"sourceFile","fileName":"IteratorsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsJVMKt -> com.android.tools.r8.internal.zI0:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsJVMKt -> com.android.tools.r8.internal.CI0:
 # {"id":"sourceFile","fileName":"MutableCollectionsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__ReversedViewsKt -> com.android.tools.r8.internal.AI0:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__ReversedViewsKt -> com.android.tools.r8.internal.DI0:
 # {"id":"sourceFile","fileName":"ReversedViews.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt -> com.android.tools.r8.internal.CI0:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt -> com.android.tools.r8.internal.FI0:
 # {"id":"sourceFile","fileName":"_Collections.kt"}
     1:2:java.util.Collection toCollection(java.lang.Iterable,java.util.Collection):1293:1294 -> a
     3:4:java.util.List toMutableList(java.lang.Iterable):1324:1325 -> a
     5:5:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.util.Collection):1333:1333 -> a
     5:5:java.util.List toMutableList(java.lang.Iterable):1325 -> a
     6:6:java.util.List toMutableList(java.lang.Iterable):1326:1326 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.internal.BI0:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.internal.EI0:
 # {"id":"sourceFile","fileName":"_Collections.kt"}
     java.lang.Iterable $this_withIndex -> a
     1:1:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1.invoke():1628:1628 -> a
     1:1:java.lang.Object invoke():0 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.tools.r8.internal.eN0:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.tools.r8.internal.hN0:
 # {"id":"sourceFile","fileName":"Collections.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
@@ -100783,7 +100895,7 @@ com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.t
     1:1:java.lang.Object next():15 -> next
     1:1:java.lang.Void com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator.previous():21:21 -> previous
     1:1:java.lang.Object previous():15 -> previous
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools.r8.internal.fN0:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools.r8.internal.iN0:
 # {"id":"sourceFile","fileName":"Collections.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyList INSTANCE -> a
     1:1:void <clinit>():24:24 -> <clinit>
@@ -100807,7 +100919,7 @@ com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools
     3:3:java.util.ListIterator listIterator(int):43:43 -> listIterator
     1:1:java.util.List subList(int,int):49:49 -> subList
     1:1:java.lang.String toString():29:29 -> toString
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap -> com.android.tools.r8.internal.gN0:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap -> com.android.tools.r8.internal.jN0:
 # {"id":"sourceFile","fileName":"Maps.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap INSTANCE -> a
     1:1:void <clinit>():14:14 -> <clinit>
@@ -100820,7 +100932,7 @@ com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap -> com.android.tools.
     1:1:java.util.Set keySet():14:14 -> keySet
     1:1:java.lang.String toString():19:19 -> toString
     1:1:java.util.Collection values():14:14 -> values
-com.android.tools.r8.jetbrains.kotlin.collections.EmptySet -> com.android.tools.r8.internal.iN0:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptySet -> com.android.tools.r8.internal.lN0:
 # {"id":"sourceFile","fileName":"Sets.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptySet INSTANCE -> a
     1:1:void <clinit>():14:14 -> <clinit>
@@ -100832,19 +100944,19 @@ com.android.tools.r8.jetbrains.kotlin.collections.EmptySet -> com.android.tools.
     1:1:boolean equals(java.lang.Object):17:17 -> equals
     1:1:java.util.Iterator iterator():26:26 -> iterator
     1:1:java.lang.String toString():19:19 -> toString
-com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue -> com.android.tools.r8.internal.qT0:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue -> com.android.tools.r8.internal.tT0:
 # {"id":"sourceFile","fileName":"IndexedValue.kt"}
     java.lang.Object value -> b
     int index -> a
     1:1:void <init>(int,java.lang.Object):14:14 -> <init>
     1:1:int getIndex():14:14 -> a
     1:1:java.lang.Object getValue():14:14 -> b
-com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterable -> com.android.tools.r8.internal.rT0:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterable -> com.android.tools.r8.internal.uT0:
 # {"id":"sourceFile","fileName":"Iterables.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 iteratorFactory -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):24:24 -> <init>
     1:1:java.util.Iterator iterator():25:25 -> iterator
-com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator -> com.android.tools.r8.internal.sT0:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator -> com.android.tools.r8.internal.vT0:
 # {"id":"sourceFile","fileName":"Iterators.kt"}
     java.util.Iterator iterator -> b
     int index -> a
@@ -100852,7 +100964,7 @@ com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator -> com.androi
     1:1:boolean hasNext():40:40 -> hasNext
     1:1:com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator.next():41:41 -> next
     1:1:java.lang.Object next():38 -> next
-com.android.tools.r8.jetbrains.kotlin.collections.MapsKt -> com.android.tools.r8.internal.G61:
+com.android.tools.r8.jetbrains.kotlin.collections.MapsKt -> com.android.tools.r8.internal.J61:
     int mapCapacity(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
     1:4:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):545:548 -> a
@@ -100868,13 +100980,13 @@ com.android.tools.r8.jetbrains.kotlin.collections.MapsKt -> com.android.tools.r8
     34:34:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):546:546 -> a
     34:34:java.util.Map toMap(java.lang.Iterable):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsJVMKt -> com.android.tools.r8.internal.H61:
+com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsJVMKt -> com.android.tools.r8.internal.K61:
 # {"id":"sourceFile","fileName":"MapsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.MapsKt___MapsKt -> com.android.tools.r8.internal.I61:
+com.android.tools.r8.jetbrains.kotlin.collections.MapsKt___MapsKt -> com.android.tools.r8.internal.L61:
 # {"id":"sourceFile","fileName":"_Maps.kt"}
     1:2:void com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.putAll(java.util.Map,java.lang.Iterable):413:414 -> a
     1:2:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable,java.util.Map):558 -> a
-com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.internal.Af1:
+com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.internal.Df1:
 # {"id":"sourceFile","fileName":"progressionUtil.kt"}
     1:1:int mod(int,int):10:10 -> a
     2:2:int com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt.differenceModulo(int,int,int):21:21 -> a
@@ -100882,72 +100994,72 @@ com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.
     3:3:int com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt.differenceModulo(int,int,int):21:21 -> a
     3:3:int getProgressionLastElement(int,int,int):47 -> a
     4:4:int getProgressionLastElement(int,int,int):48:48 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt -> com.android.tools.r8.internal.eZ0:
+com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt -> com.android.tools.r8.internal.hZ0:
 # {"id":"sourceFile","fileName":"JvmClassMapping.kt"}
     1:10:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):58:67 -> a
     11:19:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):62:70 -> a
     20:20:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):68:68 -> a
     21:27:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):63:69 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.KotlinReflectionNotSupportedError -> com.android.tools.r8.internal.z31:
+com.android.tools.r8.jetbrains.kotlin.jvm.KotlinReflectionNotSupportedError -> com.android.tools.r8.internal.C31:
 # {"id":"sourceFile","fileName":"KotlinReflectionNotSupportedError.kt"}
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.internal.YP0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.internal.bQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
     java.lang.Object invoke() -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.internal.aQ0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.internal.dQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
     java.lang.Object invoke(java.lang.Object) -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function10 -> com.android.tools.r8.internal.ZP0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function10 -> com.android.tools.r8.internal.cQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function11 -> com.android.tools.r8.internal.bQ0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function11 -> com.android.tools.r8.internal.eQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function12 -> com.android.tools.r8.internal.cQ0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function12 -> com.android.tools.r8.internal.fQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function13 -> com.android.tools.r8.internal.dQ0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function13 -> com.android.tools.r8.internal.gQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function14 -> com.android.tools.r8.internal.eQ0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function14 -> com.android.tools.r8.internal.hQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function15 -> com.android.tools.r8.internal.fQ0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function15 -> com.android.tools.r8.internal.iQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function16 -> com.android.tools.r8.internal.gQ0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function16 -> com.android.tools.r8.internal.jQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function17 -> com.android.tools.r8.internal.hQ0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function17 -> com.android.tools.r8.internal.kQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function18 -> com.android.tools.r8.internal.iQ0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function18 -> com.android.tools.r8.internal.lQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function19 -> com.android.tools.r8.internal.jQ0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function19 -> com.android.tools.r8.internal.mQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.internal.oQ0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.internal.rQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function20 -> com.android.tools.r8.internal.lQ0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function20 -> com.android.tools.r8.internal.oQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function21 -> com.android.tools.r8.internal.mQ0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function21 -> com.android.tools.r8.internal.pQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function22 -> com.android.tools.r8.internal.nQ0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function22 -> com.android.tools.r8.internal.qQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function3 -> com.android.tools.r8.internal.pQ0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function3 -> com.android.tools.r8.internal.sQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function4 -> com.android.tools.r8.internal.qQ0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function4 -> com.android.tools.r8.internal.tQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function5 -> com.android.tools.r8.internal.rQ0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function5 -> com.android.tools.r8.internal.uQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function6 -> com.android.tools.r8.internal.sQ0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function6 -> com.android.tools.r8.internal.vQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function7 -> com.android.tools.r8.internal.tQ0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function7 -> com.android.tools.r8.internal.wQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function8 -> com.android.tools.r8.internal.uQ0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function8 -> com.android.tools.r8.internal.xQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function9 -> com.android.tools.r8.internal.vQ0:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function9 -> com.android.tools.r8.internal.yQ0:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver -> com.android.tools.r8.internal.PC0:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver -> com.android.tools.r8.internal.SC0:
     com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver INSTANCE -> a
     1:1:void <clinit>():52:52 -> <clinit>
     1:1:void <init>():51:51 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver access$000():51:51 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassBasedDeclarationContainer -> com.android.tools.r8.internal.eG0:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassBasedDeclarationContainer -> com.android.tools.r8.internal.hG0:
 # {"id":"sourceFile","fileName":"ClassBasedDeclarationContainer.kt"}
     java.lang.Class getJClass() -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android.tools.r8.internal.mH0:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android.tools.r8.internal.pH0:
 # {"id":"sourceFile","fileName":"ClassReference.kt"}
     java.util.Map FUNCTION_CLASSES -> b
     java.lang.Class jClass -> a
@@ -100972,7 +101084,7 @@ com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android
     2:2:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference.getJClass():10:10 -> toString
     2:2:java.lang.String toString():97 -> toString
     3:3:java.lang.String toString():97:97 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.internal.uI0:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.internal.xI0:
 # {"id":"sourceFile","fileName":"CollectionToArray.kt"}
     java.lang.Object[] EMPTY -> a
     1:1:void <clinit>():14:14 -> <clinit>
@@ -100984,8 +101096,8 @@ com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.andr
     253:256:java.lang.Object[] toArray(java.util.Collection):83:86 -> a
     257:340:java.lang.Object[] toArray(java.util.Collection):21:104 -> a
     341:341:java.lang.Object[] toArray(java.util.Collection):23:23 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker -> com.android.tools.r8.internal.oK0:
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.internal.HX0:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker -> com.android.tools.r8.internal.rK0:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.internal.KX0:
     1:1:java.lang.String stringPlus(java.lang.String,java.lang.Object):20:20 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.throwJavaNpe():45:45 -> a
     2:2:void checkNotNull(java.lang.Object):25 -> a
@@ -101004,11 +101116,11 @@ com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.too
     2:13:void checkNotNullParameter(java.lang.Object,java.lang.String):131 -> b
     14:14:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.throwParameterIsNullNPE(java.lang.String):140:140 -> b
     14:14:void checkNotNullParameter(java.lang.Object,java.lang.String):131 -> b
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda -> com.android.tools.r8.internal.T31:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda -> com.android.tools.r8.internal.W31:
 # {"id":"sourceFile","fileName":"Lambda.kt"}
     1:1:void <init>(int):10:10 -> <init>
     1:1:java.lang.String toString():11:11 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.PackageReference -> com.android.tools.r8.internal.Wd1:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.PackageReference -> com.android.tools.r8.internal.Zd1:
 # {"id":"sourceFile","fileName":"PackageReference.kt"}
     java.lang.Class jClass -> a
     1:1:void <init>(java.lang.Class,java.lang.String):11:11 -> <init>
@@ -101027,7 +101139,7 @@ com.android.tools.r8.jetbrains.kotlin.jvm.internal.PackageReference -> com.andro
     2:2:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.internal.PackageReference.getJClass():12:12 -> toString
     2:2:java.lang.String toString():25 -> toString
     3:3:java.lang.String toString():25:25 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference -> com.android.tools.r8.internal.dg1:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference -> com.android.tools.r8.internal.gg1:
     java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.NO_RECEIVER -> g
     com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.reflected -> a
     java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.receiver -> b
@@ -101072,7 +101184,7 @@ com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference -> com.andr
     7:7:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getName():120:120 -> toString
     7:7:java.lang.String toString():74 -> toString
     8:8:java.lang.String toString():74:74 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1Impl -> com.android.tools.r8.internal.cg1:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1Impl -> com.android.tools.r8.internal.fg1:
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer,java.lang.String,java.lang.String):15:15 -> <init>
     2:2:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.<init>(java.lang.Object,java.lang.Class,java.lang.String,java.lang.String,int):25:25 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer,java.lang.String,java.lang.String):15 -> <init>
@@ -101122,7 +101234,7 @@ com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1Impl -> com
     4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():40 -> c
     4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():0 -> c
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection -> com.android.tools.r8.internal.ok1:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection -> com.android.tools.r8.internal.mk1:
     com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory factory -> a
     1:9:void <clinit>():26:34 -> <clinit>
     1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KClass getOrCreateKotlinClass(java.lang.Class):59:59 -> a
@@ -101136,9 +101248,9 @@ com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection -> com.android.too
     1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer getOrCreateKotlinPackage(java.lang.Class):51:51 -> b
     2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.getOrCreateKotlinPackage(java.lang.Class,java.lang.String):26:26 -> b
     2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer getOrCreateKotlinPackage(java.lang.Class):51 -> b
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.internal.pk1:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.internal.nk1:
     1:1:void <init>():14:14 -> <init>
-com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression -> com.android.tools.r8.internal.OW0:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression -> com.android.tools.r8.internal.RW0:
 # {"id":"sourceFile","fileName":"Progressions.kt"}
     int last -> b
     int step -> c
@@ -101150,7 +101262,7 @@ com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression -> com.android.tools
     1:1:int getLast():97:97 -> b
     1:1:com.android.tools.r8.jetbrains.kotlin.collections.IntIterator com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression.iterator():104:104 -> iterator
     1:1:java.util.Iterator iterator():77 -> iterator
-com.android.tools.r8.jetbrains.kotlin.ranges.IntProgressionIterator -> com.android.tools.r8.internal.PW0:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgressionIterator -> com.android.tools.r8.internal.SW0:
 # {"id":"sourceFile","fileName":"ProgressionIterators.kt"}
     int step -> d
     boolean hasNext -> b
@@ -101177,7 +101289,7 @@ com.android.tools.r8.jetbrains.kotlin.ranges.IntProgressionIterator -> com.andro
     1:1:void com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.remove():0:0 -> remove
     1:1:void com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.remove():0 -> remove
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlin.ranges.IntRange -> com.android.tools.r8.internal.QW0:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntRange -> com.android.tools.r8.internal.TW0:
 # {"id":"sourceFile","fileName":"Ranges.kt"}
     1:1:void <clinit>():68:68 -> <clinit>
     1:1:void <init>(int,int):44:44 -> <init>
@@ -101185,27 +101297,27 @@ com.android.tools.r8.jetbrains.kotlin.ranges.IntRange -> com.android.tools.r8.in
     1:1:int hashCode():62:62 -> hashCode
     1:1:boolean isEmpty():55:55 -> isEmpty
     1:1:java.lang.String toString():64:64 -> toString
-com.android.tools.r8.jetbrains.kotlin.reflect.KCallable -> com.android.tools.r8.internal.m01:
+com.android.tools.r8.jetbrains.kotlin.reflect.KCallable -> com.android.tools.r8.internal.p01:
 # {"id":"sourceFile","fileName":"KCallable.kt"}
     java.lang.Object call(java.lang.Object[]) -> a
-com.android.tools.r8.jetbrains.kotlin.reflect.KClass -> com.android.tools.r8.internal.n01:
+com.android.tools.r8.jetbrains.kotlin.reflect.KClass -> com.android.tools.r8.internal.q01:
 # {"id":"sourceFile","fileName":"KClass.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer -> com.android.tools.r8.internal.o01:
+com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer -> com.android.tools.r8.internal.r01:
 # {"id":"sourceFile","fileName":"KDeclarationContainer.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty -> com.android.tools.r8.internal.r01:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty -> com.android.tools.r8.internal.u01:
 # {"id":"sourceFile","fileName":"KProperty.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 -> com.android.tools.r8.internal.q01:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 -> com.android.tools.r8.internal.t01:
 # {"id":"sourceFile","fileName":"KProperty.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter -> com.android.tools.r8.internal.p01:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter -> com.android.tools.r8.internal.s01:
 # {"id":"sourceFile","fileName":"KProperty.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.CharsKt -> com.android.tools.r8.internal.JF0:
+com.android.tools.r8.jetbrains.kotlin.text.CharsKt -> com.android.tools.r8.internal.MF0:
     1:1:int com.android.tools.r8.jetbrains.kotlin.text.CharsKt__CharJVMKt.checkRadix(int):312:312 -> a
     1:1:int checkRadix(int):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlin.text.CharsKt__CharKt -> com.android.tools.r8.internal.KF0:
+com.android.tools.r8.jetbrains.kotlin.text.CharsKt__CharKt -> com.android.tools.r8.internal.NF0:
 # {"id":"sourceFile","fileName":"Char.kt"}
     1:4:boolean equals(char,char,boolean):237:240 -> a
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.internal.op1:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.internal.gp1:
     boolean contains$default(java.lang.CharSequence,char,boolean,int,java.lang.Object) -> a
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substringAfterLast(java.lang.String,char,java.lang.String):0:0 -> a
@@ -101242,15 +101354,15 @@ com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.int
     762:762:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith$default(java.lang.String,java.lang.String,boolean,int,java.lang.Object):413:413 -> a
     762:762:boolean startsWith$default(java.lang.String,java.lang.String,boolean,int,java.lang.Object):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__IndentKt -> com.android.tools.r8.internal.pp1:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__IndentKt -> com.android.tools.r8.internal.hp1:
 # {"id":"sourceFile","fileName":"Indent.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsKt -> com.android.tools.r8.internal.qp1:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsKt -> com.android.tools.r8.internal.ip1:
 # {"id":"sourceFile","fileName":"RegexExtensions.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderKt -> com.android.tools.r8.internal.rp1:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderKt -> com.android.tools.r8.internal.jp1:
 # {"id":"sourceFile","fileName":"StringBuilder.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsKt -> com.android.tools.r8.internal.sp1:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsKt -> com.android.tools.r8.internal.kp1:
 # {"id":"sourceFile","fileName":"StringNumberConversions.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt -> com.android.tools.r8.internal.tp1:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt -> com.android.tools.r8.internal.lp1:
 # {"id":"sourceFile","fileName":"Strings.kt"}
     1:1:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains(java.lang.CharSequence,char,boolean):0:0 -> a
     1:1:boolean contains$default(java.lang.CharSequence,char,boolean,int,java.lang.Object):1160 -> a
@@ -101276,9 +101388,9 @@ com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt -> com.android.t
     680:682:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith(java.lang.String,java.lang.String,boolean):415:417 -> a
     683:685:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.regionMatches(java.lang.String,int,java.lang.String,int,int,boolean):649:651 -> a
     683:685:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith(java.lang.String,java.lang.String,boolean):417 -> a
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt___StringsKt -> com.android.tools.r8.internal.up1:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt___StringsKt -> com.android.tools.r8.internal.mp1:
 # {"id":"sourceFile","fileName":"_Strings.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.internal.vP0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.internal.yP0:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     int bitWidth -> b
     int value -> c
@@ -101289,51 +101401,51 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.int
     3:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):43:43 -> <init>
     1:1:boolean invoke(int):52:52 -> a
     1:1:int plus$kotlinx_metadata(int):46:46 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Property -> com.android.tools.r8.internal.sP0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Property -> com.android.tools.r8.internal.vP0:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag HAS_GETTER -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag HAS_SETTER -> b
     1:79:void <clinit>():343:421 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Type -> com.android.tools.r8.internal.tP0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Type -> com.android.tools.r8.internal.wP0:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_NULLABLE -> a
     1:7:void <clinit>():455:461 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$TypeParameter -> com.android.tools.r8.internal.uP0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$TypeParameter -> com.android.tools.r8.internal.xP0:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_REIFIED -> a
     1:1:void <clinit>():472:472 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$ValueParameter -> com.android.tools.r8.internal.vP0$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$ValueParameter -> com.android.tools.r8.internal.yP0$a:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag DECLARES_DEFAULT_VALUE -> a
     1:13:void <clinit>():486:498 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt -> com.android.tools.r8.internal.DP0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt -> com.android.tools.r8.internal.GP0:
 # {"id":"sourceFile","fileName":"Flags.kt"}
     1:1:int flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):28:28 -> a
     2:2:int flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):25:25 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.internal.oT0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.internal.rT0:
 # {"id":"sourceFile","fileName":"InconsistentKotlinMetadataException.kt"}
     1:1:void <init>(java.lang.String,java.lang.Throwable):8:8 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation -> com.android.tools.r8.internal.s01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation -> com.android.tools.r8.internal.v01:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.util.Map arguments -> b
     java.lang.String className -> a
     1:1:void <init>(java.lang.String,java.util.Map):18:18 -> <init>
     1:1:java.util.Map getArguments():18:18 -> a
     1:1:java.lang.String getClassName():18:18 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument -> com.android.tools.r8.internal.u01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument -> com.android.tools.r8.internal.x01:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     1:1:void <init>():23:23 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue -> com.android.tools.r8.internal.t01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue -> com.android.tools.r8.internal.w01:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation annotation -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):65:65 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation getAnnotation():65:65 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ArrayValue -> com.android.tools.r8.internal.u01$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ArrayValue -> com.android.tools.r8.internal.x01$a:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.util.List elements -> a
     1:1:void <init>(java.util.List):66:66 -> <init>
     1:1:java.util.List getElements():66:66 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue -> com.android.tools.r8.internal.v01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue -> com.android.tools.r8.internal.y01:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     boolean value -> a
     1:1:void <init>(boolean):44:44 -> <init>
@@ -101350,7 +101462,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValu
     1:1:java.lang.Boolean com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue.getValue():44:44 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue -> com.android.tools.r8.internal.w01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue -> com.android.tools.r8.internal.z01:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     byte value -> a
     1:1:void <init>(byte):37:37 -> <init>
@@ -101363,7 +101475,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue -
     1:1:java.lang.Byte com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue.getValue():37:37 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue -> com.android.tools.r8.internal.x01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue -> com.android.tools.r8.internal.A01:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     char value -> a
     1:1:void <init>(char):38:38 -> <init>
@@ -101380,7 +101492,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue -
     1:1:java.lang.Character com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue.getValue():38:38 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue -> com.android.tools.r8.internal.y01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue -> com.android.tools.r8.internal.B01:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     double value -> a
     1:1:void <init>(double):43:43 -> <init>
@@ -101394,14 +101506,14 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue
     1:1:java.lang.Double com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue.getValue():43:43 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$EnumValue -> com.android.tools.r8.internal.z01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$EnumValue -> com.android.tools.r8.internal.C01:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String enumClassName -> a
     java.lang.String enumEntryName -> b
     1:1:void <init>(java.lang.String,java.lang.String):63:63 -> <init>
     1:1:java.lang.String getEnumClassName():63:63 -> a
     1:1:java.lang.String getEnumEntryName():63:63 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue -> com.android.tools.r8.internal.A01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue -> com.android.tools.r8.internal.D01:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     float value -> a
     1:1:void <init>(float):42:42 -> <init>
@@ -101415,7 +101527,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue
     1:1:java.lang.Float com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue.getValue():42:42 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue -> com.android.tools.r8.internal.B01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue -> com.android.tools.r8.internal.E01:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     int value -> a
     1:1:void <init>(int):40:40 -> <init>
@@ -101432,17 +101544,17 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue ->
     1:1:java.lang.Integer com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue.getValue():40:40 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue -> com.android.tools.r8.internal.C01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue -> com.android.tools.r8.internal.F01:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String className -> a
     int arrayDimensionCount -> b
     1:1:void <init>(java.lang.String,int):61:61 -> <init>
     1:1:int getArrayDimensionCount():61:61 -> a
     1:1:java.lang.String getClassName():61:61 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LiteralValue -> com.android.tools.r8.internal.D01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LiteralValue -> com.android.tools.r8.internal.G01:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     1:1:void <init>():30:30 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue -> com.android.tools.r8.internal.E01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue -> com.android.tools.r8.internal.H01:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     long value -> a
     1:1:void <init>(long):41:41 -> <init>
@@ -101459,7 +101571,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue -
     1:1:java.lang.Long com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue.getValue():41:41 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue -> com.android.tools.r8.internal.F01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue -> com.android.tools.r8.internal.I01:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     short value -> a
     1:1:void <init>(short):39:39 -> <init>
@@ -101476,7 +101588,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue
     1:1:java.lang.Short com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue.getValue():39:39 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue -> com.android.tools.r8.internal.G01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue -> com.android.tools.r8.internal.J01:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String value -> a
     1:1:void <init>(java.lang.String):59:59 -> <init>
@@ -101490,7 +101602,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue.getValue():59:59 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue -> com.android.tools.r8.internal.H01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue -> com.android.tools.r8.internal.K01:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     byte value -> a
     1:1:void <init>(byte):48:48 -> <init>
@@ -101504,7 +101616,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue
     2:2:java.lang.String com.android.tools.r8.jetbrains.kotlin.UByte.toString-impl(byte):334:334 -> toString
     2:2:java.lang.String toString():0 -> toString
     3:3:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue -> com.android.tools.r8.internal.I01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue -> com.android.tools.r8.internal.L01:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     int value -> a
     1:1:void <init>(int):54:54 -> <init>
@@ -101518,7 +101630,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue -
     2:2:java.lang.String com.android.tools.r8.jetbrains.kotlin.UInt.toString-impl(int):356:356 -> toString
     2:2:java.lang.String toString():0 -> toString
     3:3:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue -> com.android.tools.r8.internal.J01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue -> com.android.tools.r8.internal.M01:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     long value -> a
     1:1:void <init>(long):57:57 -> <init>
@@ -101534,7 +101646,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue
     2:10:java.lang.String com.android.tools.r8.jetbrains.kotlin.ULong.toString-impl(long):359 -> toString
     2:10:java.lang.String toString():0 -> toString
     11:11:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue -> com.android.tools.r8.internal.K01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue -> com.android.tools.r8.internal.N01:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     short value -> a
     1:1:void <init>(short):51:51 -> <init>
@@ -101548,7 +101660,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue
     2:2:java.lang.String com.android.tools.r8.jetbrains.kotlin.UShort.toString-impl(short):335:335 -> toString
     2:2:java.lang.String toString():0 -> toString
     3:3:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass -> com.android.tools.r8.internal.L01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass -> com.android.tools.r8.internal.O01:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List extensions -> q
     java.util.List versionRequirements -> p
@@ -101636,9 +101748,9 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass -> com.android.tools.r8.
     1:1:java.util.List getSupertypes():54:54 -> p
     1:1:java.util.List getTypeParameters():49:49 -> q
     1:1:java.util.List getVersionRequirements():109:109 -> r
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.internal.N01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.internal.Q01:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.internal.O01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.internal.R01:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):57:57 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):57:57 -> <init>
@@ -101657,30 +101769,30 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.to
     1:1:void visitEnd():170 -> e
     2:2:void visitEnd():170:170 -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement() -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier -> com.android.tools.r8.internal.Q01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier -> com.android.tools.r8.internal.T01:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     1:1:void <init>():971:971 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$Class -> com.android.tools.r8.internal.P01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$Class -> com.android.tools.r8.internal.S01:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.String name -> a
     1:1:void <init>(java.lang.String):977:977 -> <init>
     1:1:java.lang.String getName():977:977 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeAlias -> com.android.tools.r8.internal.Q01$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeAlias -> com.android.tools.r8.internal.T01$a:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.String name -> a
     1:1:void <init>(java.lang.String):992:992 -> <init>
     1:1:java.lang.String getName():992:992 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeParameter -> com.android.tools.r8.internal.Q01$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeParameter -> com.android.tools.r8.internal.T01$b:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     int id -> a
     1:1:void <init>(int):984:984 -> <init>
     1:1:int getId():984:984 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue -> com.android.tools.r8.internal.R01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue -> com.android.tools.r8.internal.U01:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Object value -> a
     1:1:void <init>(java.lang.Object):1041:1041 -> <init>
     1:1:java.lang.Object getValue():1041:1041 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor -> com.android.tools.r8.internal.S01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor -> com.android.tools.r8.internal.V01:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List extensions -> e
     java.util.List versionRequirements -> d
@@ -101700,9 +101812,9 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor -> com.android.too
     1:1:int getFlags():307:307 -> c
     1:1:java.util.List getValueParameters():311:311 -> d
     1:1:java.util.List getVersionRequirements():316:316 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor -> com.android.tools.r8.internal.U01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor -> com.android.tools.r8.internal.X01:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.android.tools.r8.internal.V01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.android.tools.r8.internal.Y01:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):263:263 -> <init>
@@ -101711,7 +101823,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.andr
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String) -> a
     1:1:void visitEnd():291:291 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract -> com.android.tools.r8.internal.W01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract -> com.android.tools.r8.internal.Z01:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List effects -> b
     1:5:void <init>():831:835 -> <init>
@@ -101719,19 +101831,19 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract -> com.android.tools.
     2:205:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):846:846 -> a
     206:206:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):847:847 -> a
     1:1:java.util.List getEffects():835:835 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor -> com.android.tools.r8.internal.X01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor -> com.android.tools.r8.internal.a11:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):732:732 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):732:732 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor visitEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind):741:741 -> a
     2:2:void visitEnd():747:747 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer -> com.android.tools.r8.internal.Y01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer -> com.android.tools.r8.internal.b11:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List getProperties() -> a
     java.util.List getTypeAliases() -> b
     java.util.List getFunctions() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor -> com.android.tools.r8.internal.Z01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor -> com.android.tools.r8.internal.c11:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor):11:11 -> <init>
@@ -101739,7 +101851,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor ->
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int) -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String) -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor getDelegate():11:11 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect -> com.android.tools.r8.internal.a11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect -> com.android.tools.r8.internal.d11:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List constructorArguments -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType type -> b
@@ -101757,7 +101869,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect -> com.android.tools.r8
     1:1:java.util.List getConstructorArguments():869:869 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind getInvocationKind():863:863 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType getType():862:862 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression -> com.android.tools.r8.internal.b11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression -> com.android.tools.r8.internal.e11:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Integer parameterIndex -> c
     java.util.List andArguments -> f
@@ -101782,7 +101894,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression -> com.androi
     1:1:java.util.List getOrArguments():932:932 -> g
     1:1:java.lang.Integer getParameterIndex():910:910 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType isInstanceType():920:920 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor -> com.android.tools.r8.internal.c11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor -> com.android.tools.r8.internal.f11:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor):791:791 -> <init>
@@ -101793,7 +101905,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor -> com
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitAndArgument():825:825 -> a
     1:1:void visitEnd():838:838 -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitOrArgument() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind -> com.android.tools.r8.internal.d11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind -> com.android.tools.r8.internal.g11:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind[] $VALUES -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind EXACTLY_ONCE -> b
@@ -101805,7 +101917,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind -> com.an
     5:5:void <clinit>():884:884 -> <clinit>
     1:1:void <init>(java.lang.String,int):881:881 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind[] values() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType -> com.android.tools.r8.internal.e11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType -> com.android.tools.r8.internal.h11:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType CALLS -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType RETURNS_CONSTANT -> a
@@ -101817,7 +101929,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType -> com.android.tool
     5:5:void <clinit>():872:872 -> <clinit>
     1:1:void <init>(java.lang.String,int):869:869 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType[] values() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor -> com.android.tools.r8.internal.f11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor -> com.android.tools.r8.internal.i11:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor):760:760 -> <init>
@@ -101825,7 +101937,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor -> com.android.t
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConclusionOfConditionalEffect():773:773 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConstructorArgument():766:766 -> b
     1:1:void visitEnd():779:779 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType -> com.android.tools.r8.internal.h11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType -> com.android.tools.r8.internal.k11:
 # {"id":"sourceFile","fileName":"extensions.kt"}
     com.android.tools.r8.jetbrains.kotlin.reflect.KClass klass -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):31:31 -> <init>
@@ -101839,16 +101951,16 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType -> com.android.t
     31:31:java.lang.String toString():39:39 -> toString
     32:32:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaClass(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):28:28 -> toString
     32:32:java.lang.String toString():39 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor -> com.android.tools.r8.internal.i11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor -> com.android.tools.r8.internal.l11:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.internal.j11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.internal.m11:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> a
     java.lang.String typeFlexibilityId -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):1020:1020 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():1020:1020 -> a
     1:1:java.lang.String getTypeFlexibilityId():1020:1020 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction -> com.android.tools.r8.internal.k11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction -> com.android.tools.r8.internal.n11:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List valueParameters -> f
     java.util.List typeParameters -> d
@@ -101891,9 +102003,9 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction -> com.android.tools.
     1:1:java.util.List getTypeParameters():356:356 -> i
     1:1:java.util.List getValueParameters():366:366 -> j
     1:1:java.util.List getVersionRequirements():376:376 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor -> com.android.tools.r8.internal.m11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor -> com.android.tools.r8.internal.p11:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android.tools.r8.internal.n11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android.tools.r8.internal.q11:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):301:301 -> <init>
@@ -101906,7 +102018,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):337:337 -> b
     2:2:void visitEnd():363:363 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():343:343 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda -> com.android.tools.r8.internal.o11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda -> com.android.tools.r8.internal.r11:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction function -> b
     1:1:void <init>():282:282 -> <init>
@@ -101914,14 +102026,14 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda -> com.android.tools.r8
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda.setFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):286:286 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):289 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction getFunction():286:286 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor -> com.android.tools.r8.internal.p11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor -> com.android.tools.r8.internal.s11:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):240:240 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):240:240 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):248:248 -> a
     2:2:void visitEnd():254:254 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage -> com.android.tools.r8.internal.q11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage -> com.android.tools.r8.internal.t11:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List functions -> b
     java.util.List extensions -> e
@@ -101961,9 +102073,9 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage -> com.android.tools.r
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):220 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):220:220 -> b
     1:1:java.util.List getFunctions():198:198 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor -> com.android.tools.r8.internal.s11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor -> com.android.tools.r8.internal.v11:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor -> com.android.tools.r8.internal.t11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor -> com.android.tools.r8.internal.w11:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):179:179 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):179:179 -> <init>
@@ -101971,7 +102083,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor -> com.android.
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor.getDelegate():181:181 -> e
     1:1:void visitEnd():195 -> e
     2:2:void visitEnd():195:195 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty -> com.android.tools.r8.internal.u11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty -> com.android.tools.r8.internal.x11:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List typeParameters -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter setterParameter -> h
@@ -102014,9 +102126,9 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty -> com.android.tools.
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter getSetterParameter():453:453 -> i
     1:1:java.util.List getTypeParameters():443:443 -> j
     1:1:java.util.List getVersionRequirements():463:463 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor -> com.android.tools.r8.internal.w11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor -> com.android.tools.r8.internal.z11:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android.tools.r8.internal.x11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android.tools.r8.internal.A11:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):373:373 -> <init>
@@ -102028,7 +102140,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android
     5:5:void visitEnd():429:429 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):409:409 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():415:415 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmType -> com.android.tools.r8.internal.y11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmType -> com.android.tools.r8.internal.B11:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound flexibleTypeUpperBound -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier classifier -> c
@@ -102076,7 +102188,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmType -> com.android.tools.r8.i
     1:1:int getFlags():667:667 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound getFlexibleTypeUpperBound():706:706 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getOuterType():699:699 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias -> com.android.tools.r8.internal.z11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias -> com.android.tools.r8.internal.C11:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List typeParameters -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType expandedType -> f
@@ -102127,9 +102239,9 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias -> com.android.tools
     1:1:java.lang.String getName():510:510 -> e
     1:1:java.util.List getTypeParameters():515:515 -> f
     1:1:java.util.List getVersionRequirements():536:536 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasExtensionVisitor -> com.android.tools.r8.internal.B11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasExtensionVisitor -> com.android.tools.r8.internal.E11:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor -> com.android.tools.r8.internal.C11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor -> com.android.tools.r8.internal.F11:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):439:439 -> <init>
@@ -102141,9 +102253,9 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor -> com.androi
     4:4:void visitEnd():496:496 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUnderlyingType(int):458:458 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():482:482 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor -> com.android.tools.r8.internal.E11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor -> com.android.tools.r8.internal.H11:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.tools.r8.internal.F11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.tools.r8.internal.I11:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List upperBounds -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> e
@@ -102166,9 +102278,9 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.t
     1:1:java.lang.String getName():632:632 -> d
     1:1:java.util.List getUpperBounds():639:639 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance getVariance():634:634 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.H11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.K11:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.android.tools.r8.internal.I11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.android.tools.r8.internal.L11:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor):544:544 -> <init>
@@ -102176,7 +102288,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.an
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUpperBound(int):551:551 -> a
     2:2:void visitEnd():565:565 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection -> com.android.tools.r8.internal.J11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection -> com.android.tools.r8.internal.M11:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> a
@@ -102187,7 +102299,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection -> com.android.
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType component2() -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():1002:1002 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance getVariance():1002:1002 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor -> com.android.tools.r8.internal.K11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor -> com.android.tools.r8.internal.N11:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):580:580 -> <init>
@@ -102202,7 +102314,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor -> com.android.too
     2:2:void visitStarProjection():624:624 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int):654:654 -> b
     1:1:void visitTypeParameter(int):606:606 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter -> com.android.tools.r8.internal.L11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter -> com.android.tools.r8.internal.O11:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List extensions -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> d
@@ -102228,7 +102340,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter -> com.android.
     1:1:java.lang.String getName():584:584 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():589:589 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getVarargElementType():594:594 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor -> com.android.tools.r8.internal.N11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor -> com.android.tools.r8.internal.Q11:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor):506:506 -> <init>
@@ -102237,14 +102349,14 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor -> com.a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitType(int):513:513 -> a
     2:2:void visitEnd():535:535 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitVarargElementType(int):521:521 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance -> com.android.tools.r8.internal.O11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance -> com.android.tools.r8.internal.R11:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance IN -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance INVARIANT -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance OUT -> c
     1:11:void <clinit>():850:860 -> <clinit>
     1:1:void <init>(java.lang.String,int):846:846 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion -> com.android.tools.r8.internal.P11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion -> com.android.tools.r8.internal.S11:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     int minor -> b
     int patch -> c
@@ -102254,7 +102366,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion -> com.android.tools.r
     1:1:int getMinor():1029:1029 -> b
     1:1:int getPatch():1029:1029 -> c
     1:1:java.lang.String toString():1030:1030 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement -> com.android.tools.r8.internal.Q11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement -> com.android.tools.r8.internal.T11:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Integer errorCode -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel level -> c
@@ -102282,7 +102394,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement -> com.andr
     1:1:java.lang.Integer getErrorCode():790:790 -> b
     1:1:java.lang.String getMessage():795:795 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion getVersion():800:800 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel -> com.android.tools.r8.internal.R11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel -> com.android.tools.r8.internal.U11:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel HIDDEN -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel ERROR -> b
@@ -102293,7 +102405,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel -> com
     4:4:void <clinit>():893 -> <clinit>
     5:5:void <clinit>():893:893 -> <clinit>
     1:1:void <init>(java.lang.String,int):890:890 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind -> com.android.tools.r8.internal.S11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind -> com.android.tools.r8.internal.V11:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind API_VERSION -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind LANGUAGE_VERSION -> a
@@ -102304,7 +102416,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind
     4:4:void <clinit>():902 -> <clinit>
     5:5:void <clinit>():902:902 -> <clinit>
     1:1:void <init>(java.lang.String,int):899:899 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor -> com.android.tools.r8.internal.T11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor -> com.android.tools.r8.internal.W11:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):691:691 -> <init>
@@ -102312,10 +102424,10 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor -> c
     void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String) -> a
     void visitVersion(int,int,int) -> a
     1:1:void visitEnd():720:720 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.NodesKt -> com.android.tools.r8.internal.ia1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.NodesKt -> com.android.tools.r8.internal.la1:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     1:1:java.lang.Object addTo(java.lang.Object,java.util.Collection):1044:1044 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter -> com.android.tools.r8.internal.KH0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter -> com.android.tools.r8.internal.NH0:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder t -> b
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.util.List):413:415 -> <init>
@@ -102366,70 +102478,70 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter -> com.android.
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():468 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():415:415 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder getT():414:414 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1 -> com.android.tools.r8.internal.AH0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1 -> com.android.tools.r8.internal.DH0:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):431:431 -> a
     2:433:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):0:431 -> a
     2:433:java.lang.Object invoke(java.lang.Object):431 -> a
     434:434:java.lang.Object invoke(java.lang.Object):431:431 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1 -> com.android.tools.r8.internal.BH0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1 -> com.android.tools.r8.internal.EH0:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):471:471 -> a
     2:474:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:472 -> a
     2:474:java.lang.Object invoke(java.lang.Object):471 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1 -> com.android.tools.r8.internal.CH0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1 -> com.android.tools.r8.internal.FH0:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):434:434 -> a
     2:436:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):0:434 -> a
     2:436:java.lang.Object invoke(java.lang.Object):434 -> a
     437:437:java.lang.Object invoke(java.lang.Object):434:434 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitInlineClassUnderlyingType$1 -> com.android.tools.r8.internal.DH0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitInlineClassUnderlyingType$1 -> com.android.tools.r8.internal.GH0:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):465:465 -> a
     2:467:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitInlineClassUnderlyingType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:465 -> a
     2:467:java.lang.Object invoke(java.lang.Object):465 -> a
     468:468:java.lang.Object invoke(java.lang.Object):465:465 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$1 -> com.android.tools.r8.internal.EH0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$1 -> com.android.tools.r8.internal.HH0:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):437:437 -> a
     2:439:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:437 -> a
     2:439:java.lang.Object invoke(java.lang.Object):437 -> a
     440:440:java.lang.Object invoke(java.lang.Object):437:437 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$1 -> com.android.tools.r8.internal.FH0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$1 -> com.android.tools.r8.internal.IH0:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):428:428 -> a
     2:430:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:428 -> a
     2:430:java.lang.Object invoke(java.lang.Object):428 -> a
     431:431:java.lang.Object invoke(java.lang.Object):428:428 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.GH0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.JH0:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):440:440 -> a
     2:442:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):0:440 -> a
     2:442:java.lang.Object invoke(java.lang.Object):440 -> a
     443:443:java.lang.Object invoke(java.lang.Object):440:440 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$1 -> com.android.tools.r8.internal.HH0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$1 -> com.android.tools.r8.internal.KH0:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):425:425 -> a
     2:427:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:425 -> a
     2:427:java.lang.Object invoke(java.lang.Object):425 -> a
     428:428:java.lang.Object invoke(java.lang.Object):425:425 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1 -> com.android.tools.r8.internal.IH0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1 -> com.android.tools.r8.internal.LH0:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):468:468 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1.invoke(int):468:468 -> a
     2:2:java.lang.Object invoke(java.lang.Object):468 -> a
     3:3:java.lang.Object invoke(java.lang.Object):468:468 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter -> com.android.tools.r8.internal.k41:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter -> com.android.tools.r8.internal.n41:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder t -> b
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):532:534 -> <init>
@@ -102440,14 +102552,14 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter -> com.android
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):537 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():534:534 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder getT():533:533 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter$visitFunction$1 -> com.android.tools.r8.internal.j41:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter$visitFunction$1 -> com.android.tools.r8.internal.m41:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):537:537 -> a
     2:539:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter$visitFunction$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):0:537 -> a
     2:539:java.lang.Object invoke(java.lang.Object):537 -> a
     540:540:java.lang.Object invoke(java.lang.Object):537:537 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter -> com.android.tools.r8.internal.be1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter -> com.android.tools.r8.internal.ee1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder t -> b
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.util.List):482:484 -> <init>
@@ -102468,35 +102580,35 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter -> com.androi
     3:3:void visitEnd():502:502 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():484:484 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder getT():483:483 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1 -> com.android.tools.r8.internal.Xd1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1 -> com.android.tools.r8.internal.ae1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):496:496 -> a
     2:499:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:497 -> a
     2:499:java.lang.Object invoke(java.lang.Object):496 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1 -> com.android.tools.r8.internal.Yd1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1 -> com.android.tools.r8.internal.be1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):487:487 -> a
     2:489:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):0:487 -> a
     2:489:java.lang.Object invoke(java.lang.Object):487 -> a
     490:490:java.lang.Object invoke(java.lang.Object):487:487 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1 -> com.android.tools.r8.internal.Zd1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1 -> com.android.tools.r8.internal.ce1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):490:490 -> a
     2:492:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:490 -> a
     2:492:java.lang.Object invoke(java.lang.Object):490 -> a
     493:493:java.lang.Object invoke(java.lang.Object):490:490 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.ae1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.de1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):493:493 -> a
     2:495:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):0:493 -> a
     2:495:java.lang.Object invoke(java.lang.Object):493 -> a
     496:496:java.lang.Object invoke(java.lang.Object):493:493 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext -> com.android.tools.r8.internal.oi1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext -> com.android.tools.r8.internal.ri1:
 # {"id":"sourceFile","fileName":"readers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable types -> b
     java.util.List contextExtensions -> e
@@ -102514,7 +102626,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext -> com.android.
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable getTypes():23:23 -> c
     2:2:java.lang.Integer getTypeParameterId(int):39:39 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable getVersionRequirements$kotlinx_metadata():24:24 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt -> com.android.tools.r8.internal.qi1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt -> com.android.tools.r8.internal.ti1:
 # {"id":"sourceFile","fileName":"readUtils.kt"}
     1:53:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):18:70 -> a
     54:54:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver):69:69 -> a
@@ -102547,10 +102659,10 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt -> com.android.
     176:176:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver.getQualifiedClassName(int):74:74 -> a
     176:176:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,int):57 -> a
     177:177:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,int):58:58 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt$WhenMappings -> com.android.tools.r8.internal.pi1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt$WhenMappings -> com.android.tools.r8.internal.si1:
 # {"id":"sourceFile","fileName":"readUtils.kt"}
     int[] $EnumSwitchMapping$0 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt -> com.android.tools.r8.internal.ri1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt -> com.android.tools.r8.internal.ui1:
 # {"id":"sourceFile","fileName":"readers.kt"}
     1:1:void accept$default(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,java.util.List,int,java.lang.Object):52:52 -> a
     2:59:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,java.util.List):0:57 -> a
@@ -102846,7 +102958,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt -> com.android.to
     4839:4839:int getPropertyGetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):504:504 -> a
     4840:4840:int getDefaultPropertyAccessorFlags(int):510:510 -> a
     1:1:int getPropertySetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):507:507 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext -> com.android.tools.r8.internal.Pt1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext -> com.android.tools.r8.internal.It1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable versionRequirements -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable strings -> a
@@ -102856,7 +102968,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext -> com.android
     2:2:int get(java.lang.String):26:26 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable getVersionRequirements():23:23 -> b
     2:2:int getClassName(java.lang.String):29:29 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteUtilsKt -> com.android.tools.r8.internal.Qt1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteUtilsKt -> com.android.tools.r8.internal.Jt1:
 # {"id":"sourceFile","fileName":"writeUtils.kt"}
     1:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder writeAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):17:22 -> a
     7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder writeAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):20:20 -> a
@@ -102864,10 +102976,10 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteUtilsKt -> com.android
     8:8:int getClassNameIndex(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.lang.String):111 -> a
     9:11:int getClassNameIndex(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.lang.String):112:114 -> a
     12:87:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):29:104 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt -> com.android.tools.r8.internal.Qu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt -> com.android.tools.r8.internal.Ju1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor writeProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,int,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):189:189 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 -> com.android.tools.r8.internal.Ut1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 -> com.android.tools.r8.internal.Nt1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder t -> b
@@ -102885,7 +102997,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():136 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder getT():130:130 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitExtensions$1 -> com.android.tools.r8.internal.Rt1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitExtensions$1 -> com.android.tools.r8.internal.Kt1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 this$0 -> b
@@ -102893,21 +103005,21 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$
     1:1:java.lang.Object invoke(java.lang.Object):139:139 -> a
     2:142:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:140 -> a
     2:142:java.lang.Object invoke(java.lang.Object):139 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1 -> com.android.tools.r8.internal.St1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1 -> com.android.tools.r8.internal.Lt1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):133:133 -> a
     2:135:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):0:133 -> a
     2:135:java.lang.Object invoke(java.lang.Object):133 -> a
     136:136:java.lang.Object invoke(java.lang.Object):133:133 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.Tt1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.Mt1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):136:136 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1.invoke(int):136:136 -> a
     2:2:java.lang.Object invoke(java.lang.Object):136 -> a
     3:3:java.lang.Object invoke(java.lang.Object):136:136 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 -> com.android.tools.r8.internal.Wt1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 -> com.android.tools.r8.internal.Pt1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder t -> b
@@ -102919,14 +103031,14 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 -
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor visitEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind):341 -> a
     3:3:void visitEnd():344:344 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder getT():338:338 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1 -> com.android.tools.r8.internal.Vt1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1 -> com.android.tools.r8.internal.Ot1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):341:341 -> a
     2:343:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder):0:341 -> a
     2:343:java.lang.Object invoke(java.lang.Object):341 -> a
     344:344:java.lang.Object invoke(java.lang.Object):341:341 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 -> com.android.tools.r8.internal.au1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 -> com.android.tools.r8.internal.Tt1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder t -> b
@@ -102948,24 +103060,24 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 ->
     15:15:void visitEnd():369:369 -> c
     16:21:void visitEnd():368:373 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder getT():352:352 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$WhenMappings -> com.android.tools.r8.internal.Xt1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$WhenMappings -> com.android.tools.r8.internal.Qt1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     int[] $EnumSwitchMapping$1 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1 -> com.android.tools.r8.internal.Yt1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1 -> com.android.tools.r8.internal.Rt1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):358:358 -> a
     2:360:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:358 -> a
     2:360:java.lang.Object invoke(java.lang.Object):358 -> a
     361:361:java.lang.Object invoke(java.lang.Object):358:358 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1 -> com.android.tools.r8.internal.Zt1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1 -> com.android.tools.r8.internal.St1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):355:355 -> a
     2:357:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:355 -> a
     2:357:java.lang.Object invoke(java.lang.Object):355 -> a
     358:358:java.lang.Object invoke(java.lang.Object):355:355 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 -> com.android.tools.r8.internal.eu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 -> com.android.tools.r8.internal.Xt1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder t -> b
@@ -102987,28 +103099,28 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpres
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeEffectExpression(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitOrArgument():406 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder getT():379:379 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1 -> com.android.tools.r8.internal.bu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1 -> com.android.tools.r8.internal.Ut1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):403:403 -> a
     2:405:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:403 -> a
     2:405:java.lang.Object invoke(java.lang.Object):403 -> a
     406:406:java.lang.Object invoke(java.lang.Object):403:403 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1 -> com.android.tools.r8.internal.cu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1 -> com.android.tools.r8.internal.Vt1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):400:400 -> a
     2:402:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:400 -> a
     2:402:java.lang.Object invoke(java.lang.Object):400 -> a
     403:403:java.lang.Object invoke(java.lang.Object):400:400 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1 -> com.android.tools.r8.internal.du1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1 -> com.android.tools.r8.internal.Wt1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):406:406 -> a
     2:408:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:406 -> a
     2:408:java.lang.Object invoke(java.lang.Object):406 -> a
     409:409:java.lang.Object invoke(java.lang.Object):406:406 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 -> com.android.tools.r8.internal.mu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 -> com.android.tools.r8.internal.fu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder t -> b
     int $flags -> e
@@ -103043,7 +103155,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 -
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():168 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder getT():153:153 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1 -> com.android.tools.r8.internal.fu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1 -> com.android.tools.r8.internal.Yt1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):171:171 -> a
@@ -103062,7 +103174,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$v
     179:179:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():23892:23892 -> a
     179:179:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder):171 -> a
     179:179:java.lang.Object invoke(java.lang.Object):171 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1 -> com.android.tools.r8.internal.gu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1 -> com.android.tools.r8.internal.Zt1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> a
@@ -103070,42 +103182,42 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$v
     1:1:java.lang.Object invoke(java.lang.Object):174:174 -> a
     2:177:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:175 -> a
     2:177:java.lang.Object invoke(java.lang.Object):174 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.hu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.au1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):159:159 -> a
     2:161:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:159 -> a
     2:161:java.lang.Object invoke(java.lang.Object):159 -> a
     162:162:java.lang.Object invoke(java.lang.Object):159:159 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1 -> com.android.tools.r8.internal.iu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1 -> com.android.tools.r8.internal.bu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):165:165 -> a
     2:167:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:165 -> a
     2:167:java.lang.Object invoke(java.lang.Object):165 -> a
     168:168:java.lang.Object invoke(java.lang.Object):165:165 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1 -> com.android.tools.r8.internal.ju1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1 -> com.android.tools.r8.internal.cu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):156:156 -> a
     2:158:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:156 -> a
     2:158:java.lang.Object invoke(java.lang.Object):156 -> a
     159:159:java.lang.Object invoke(java.lang.Object):156:156 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1 -> com.android.tools.r8.internal.ku1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1 -> com.android.tools.r8.internal.du1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):162:162 -> a
     2:164:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):0:162 -> a
     2:164:java.lang.Object invoke(java.lang.Object):162 -> a
     165:165:java.lang.Object invoke(java.lang.Object):162:162 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.lu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.eu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):168:168 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1.invoke(int):168:168 -> a
     2:2:java.lang.Object invoke(java.lang.Object):168 -> a
     3:3:java.lang.Object invoke(java.lang.Object):168:168 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 -> com.android.tools.r8.internal.tu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 -> com.android.tools.r8.internal.mu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder t -> b
     int $getterFlags -> f
@@ -103138,7 +103250,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 -
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():205 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder getT():190:190 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1 -> com.android.tools.r8.internal.nu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1 -> com.android.tools.r8.internal.gu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> b
@@ -103146,42 +103258,42 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$v
     1:1:java.lang.Object invoke(java.lang.Object):208:208 -> a
     2:211:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:209 -> a
     2:211:java.lang.Object invoke(java.lang.Object):208 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.ou1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.hu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):196:196 -> a
     2:198:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:196 -> a
     2:198:java.lang.Object invoke(java.lang.Object):196 -> a
     199:199:java.lang.Object invoke(java.lang.Object):196:196 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1 -> com.android.tools.r8.internal.pu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1 -> com.android.tools.r8.internal.iu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):202:202 -> a
     2:204:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:202 -> a
     2:204:java.lang.Object invoke(java.lang.Object):202 -> a
     205:205:java.lang.Object invoke(java.lang.Object):202:202 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1 -> com.android.tools.r8.internal.qu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1 -> com.android.tools.r8.internal.ju1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):199:199 -> a
     2:201:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):0:199 -> a
     2:201:java.lang.Object invoke(java.lang.Object):199 -> a
     202:202:java.lang.Object invoke(java.lang.Object):199:199 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1 -> com.android.tools.r8.internal.ru1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1 -> com.android.tools.r8.internal.ku1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):193:193 -> a
     2:195:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:193 -> a
     2:195:java.lang.Object invoke(java.lang.Object):193 -> a
     196:196:java.lang.Object invoke(java.lang.Object):193:193 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.su1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.lu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):205:205 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1.invoke(int):205:205 -> a
     2:2:java.lang.Object invoke(java.lang.Object):205 -> a
     3:3:java.lang.Object invoke(java.lang.Object):205:205 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 -> com.android.tools.r8.internal.zu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 -> com.android.tools.r8.internal.su1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder t -> b
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> e
@@ -103211,14 +103323,14 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 -> co
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int):101 -> b
     1:1:void visitTypeParameter(int):94:94 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1 -> com.android.tools.r8.internal.uu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1 -> com.android.tools.r8.internal.nu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):98:98 -> a
     2:100:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:98 -> a
     2:100:java.lang.Object invoke(java.lang.Object):98 -> a
     101:101:java.lang.Object invoke(java.lang.Object):98:98 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1 -> com.android.tools.r8.internal.vu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1 -> com.android.tools.r8.internal.ou1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance $variance -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
@@ -103228,7 +103340,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visit
     92:92:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):83:83 -> a
     92:92:java.lang.Object invoke(java.lang.Object):82 -> a
     93:93:java.lang.Object invoke(java.lang.Object):82:82 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1 -> com.android.tools.r8.internal.wu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1 -> com.android.tools.r8.internal.pu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> b
@@ -103236,7 +103348,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visit
     1:1:java.lang.Object invoke(java.lang.Object):112:112 -> a
     2:115:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:113 -> a
     2:115:java.lang.Object invoke(java.lang.Object):112 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1 -> com.android.tools.r8.internal.xu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1 -> com.android.tools.r8.internal.qu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     java.lang.String $typeFlexibilityId -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> b
@@ -103245,14 +103357,14 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visit
     2:110:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:108 -> a
     2:110:java.lang.Object invoke(java.lang.Object):104 -> a
     111:111:java.lang.Object invoke(java.lang.Object):104:104 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1 -> com.android.tools.r8.internal.yu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1 -> com.android.tools.r8.internal.ru1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):101:101 -> a
     2:103:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:101 -> a
     2:103:java.lang.Object invoke(java.lang.Object):101 -> a
     104:104:java.lang.Object invoke(java.lang.Object):101:101 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 -> com.android.tools.r8.internal.Fu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 -> com.android.tools.r8.internal.yu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder t -> b
     int $flags -> d
@@ -103280,14 +103392,14 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():270 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder getT():254:254 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1 -> com.android.tools.r8.internal.Au1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1 -> com.android.tools.r8.internal.tu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):263:263 -> a
     2:265:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:263 -> a
     2:265:java.lang.Object invoke(java.lang.Object):263 -> a
     266:266:java.lang.Object invoke(java.lang.Object):263:263 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExtensions$1 -> com.android.tools.r8.internal.Bu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExtensions$1 -> com.android.tools.r8.internal.uu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> b
@@ -103298,28 +103410,28 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$
     277:277:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.writeTypeAliasExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):0:0 -> a
     277:277:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):274 -> a
     277:277:java.lang.Object invoke(java.lang.Object):273 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1 -> com.android.tools.r8.internal.Cu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1 -> com.android.tools.r8.internal.vu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):257:257 -> a
     2:259:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:257 -> a
     2:259:java.lang.Object invoke(java.lang.Object):257 -> a
     260:260:java.lang.Object invoke(java.lang.Object):257:257 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1 -> com.android.tools.r8.internal.Du1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1 -> com.android.tools.r8.internal.wu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):260:260 -> a
     2:262:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:260 -> a
     2:262:java.lang.Object invoke(java.lang.Object):260 -> a
     263:263:java.lang.Object invoke(java.lang.Object):260:260 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.Eu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.xu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):270:270 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1.invoke(int):270:270 -> a
     2:2:java.lang.Object invoke(java.lang.Object):270 -> a
     3:3:java.lang.Object invoke(java.lang.Object):270:270 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 -> com.android.tools.r8.internal.Iu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 -> com.android.tools.r8.internal.Bu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder t -> b
     int $flags -> f
@@ -103336,7 +103448,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParamete
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUpperBound(int):40 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):43:43 -> a
     5:16:void visitEnd():48:59 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1 -> com.android.tools.r8.internal.Gu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1 -> com.android.tools.r8.internal.zu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 this$0 -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> a
@@ -103344,14 +103456,14 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParamete
     1:1:java.lang.Object invoke(java.lang.Object):43:43 -> a
     2:46:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:44 -> a
     2:46:java.lang.Object invoke(java.lang.Object):43 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1 -> com.android.tools.r8.internal.Hu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1 -> com.android.tools.r8.internal.Au1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):40:40 -> a
     2:42:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:40 -> a
     2:42:java.lang.Object invoke(java.lang.Object):40 -> a
     43:43:java.lang.Object invoke(java.lang.Object):40:40 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 -> com.android.tools.r8.internal.Mu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 -> com.android.tools.r8.internal.Fu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder t -> b
     int $flags -> d
@@ -103370,7 +103482,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParamet
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):64:64 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitVarargElementType(int):234 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitExtensions$1 -> com.android.tools.r8.internal.Ju1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitExtensions$1 -> com.android.tools.r8.internal.Cu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 this$0 -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> a
@@ -103381,21 +103493,21 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParamet
     241:241:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.writeValueParameterExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):0:0 -> a
     241:241:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):238 -> a
     241:241:java.lang.Object invoke(java.lang.Object):237 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1 -> com.android.tools.r8.internal.Ku1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1 -> com.android.tools.r8.internal.Du1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):231:231 -> a
     2:233:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:231 -> a
     2:233:java.lang.Object invoke(java.lang.Object):231 -> a
     234:234:java.lang.Object invoke(java.lang.Object):231:231 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1 -> com.android.tools.r8.internal.Lu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1 -> com.android.tools.r8.internal.Eu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):234:234 -> a
     2:236:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:234 -> a
     2:236:java.lang.Object invoke(java.lang.Object):234 -> a
     237:237:java.lang.Object invoke(java.lang.Object):234:234 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 -> com.android.tools.r8.internal.Pu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 -> com.android.tools.r8.internal.Iu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder t -> b
@@ -103419,61 +103531,61 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequi
     36:39:void visitEnd():329:332 -> a
     40:40:void visitEnd():330:330 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder getT():289:289 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1 -> com.android.tools.r8.internal.Nu1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1 -> com.android.tools.r8.internal.Gu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):323:323 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1.invoke(int):323:323 -> a
     2:2:java.lang.Object invoke(java.lang.Object):323 -> a
     3:3:java.lang.Object invoke(java.lang.Object):323:323 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2 -> com.android.tools.r8.internal.Ou1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2 -> com.android.tools.r8.internal.Hu1:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):324:324 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2.invoke(int):324:324 -> a
     2:2:java.lang.Object invoke(java.lang.Object):324 -> a
     3:3:java.lang.Object invoke(java.lang.Object):324:324 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.ExtensionUtilsKt -> com.android.tools.r8.internal.uO0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.ExtensionUtilsKt -> com.android.tools.r8.internal.xO0:
 # {"id":"sourceFile","fileName":"extensionUtils.kt"}
     1:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor applySingleExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):13:16 -> a
     5:13:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension singleOfType(java.util.Collection,com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):25:33 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmClassExtension -> com.android.tools.r8.internal.M01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmClassExtension -> com.android.tools.r8.internal.P01:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension -> com.android.tools.r8.internal.T01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension -> com.android.tools.r8.internal.W01:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension -> com.android.tools.r8.internal.g11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension -> com.android.tools.r8.internal.j11:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension -> com.android.tools.r8.internal.l11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension -> com.android.tools.r8.internal.o11:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension -> com.android.tools.r8.internal.r11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension -> com.android.tools.r8.internal.u11:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension -> com.android.tools.r8.internal.v11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension -> com.android.tools.r8.internal.y11:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeAliasExtension -> com.android.tools.r8.internal.A11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeAliasExtension -> com.android.tools.r8.internal.D11:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension -> com.android.tools.r8.internal.D11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension -> com.android.tools.r8.internal.G11:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension -> com.android.tools.r8.internal.G11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension -> com.android.tools.r8.internal.J11:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmValueParameterExtension -> com.android.tools.r8.internal.M11:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmValueParameterExtension -> com.android.tools.r8.internal.P11:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.internal.m71:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.internal.p71:
 # {"id":"sourceFile","fileName":"MetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion Companion -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion -> com.android.tools.r8.internal.l71:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion -> com.android.tools.r8.internal.o71:
 # {"id":"sourceFile","fileName":"MetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion $$INSTANCE -> a
     com.android.tools.r8.jetbrains.kotlin.Lazy INSTANCES$delegate -> b
     1:1:void <clinit>():84:84 -> <clinit>
     1:1:void <init>():83:83 -> <init>
     1:1:java.util.List getINSTANCES():84:84 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 -> com.android.tools.r8.internal.k71:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 -> com.android.tools.r8.internal.n71:
 # {"id":"sourceFile","fileName":"MetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 INSTANCE -> a
     1:2:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2.invoke():85:86 -> a
     1:2:java.lang.Object invoke():84 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1 -> com.android.tools.r8.internal.eg1:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.internal.og1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1 -> com.android.tools.r8.internal.hg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.internal.rg1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     java.util.List argument_ -> d
@@ -103532,11 +103644,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annot
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder toBuilder():4329 -> m
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation):4327:4327 -> m
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder toBuilder():4329 -> m
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$1 -> com.android.tools.r8.internal.fg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$1 -> com.android.tools.r8.internal.ig1:
     1:1:void <init>():1957:1957 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1962:1962 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1957 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument -> com.android.tools.r8.internal.mg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument -> com.android.tools.r8.internal.pg1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument defaultInstance -> g
@@ -103588,11 +103700,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annot
     1:1:boolean hasValue():3813:3813 -> k
     1:2:void initFields():3823:3824 -> l
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder newBuilder():3939:3939 -> m
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1 -> com.android.tools.r8.internal.gg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1 -> com.android.tools.r8.internal.jg1:
     1:1:void <init>():2080:2080 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2085:2085 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2080 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder -> com.android.tools.r8.internal.hg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder -> com.android.tools.r8.internal.kg1:
     int bitField0_ -> b
     int nameId_ -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value value_ -> d
@@ -103635,7 +103747,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annot
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder.create():3963:3963 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder access$3600():3949 -> f
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument buildPartial():3992:4003 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.internal.lg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.internal.og1:
     int memoizedSerializedSize -> o
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value defaultInstance -> p
     int arrayDimensionCount_ -> l
@@ -103751,11 +103863,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annot
     1:1:boolean hasFlags():2793:2793 -> x
     1:1:boolean hasFloatValue():2617:2617 -> y
     1:1:boolean hasIntValue():2602:2602 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1 -> com.android.tools.r8.internal.ig1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1 -> com.android.tools.r8.internal.lg1:
     1:1:void <init>():2399:2399 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2404:2404 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2399 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder -> com.android.tools.r8.internal.jg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder -> com.android.tools.r8.internal.mg1:
     int arrayDimensionCount_ -> l
     int flags_ -> m
     int classId_ -> h
@@ -103827,7 +103939,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annot
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value build():3060:3060 -> g
     1:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value buildPartial():3066:3114 -> h
     1:3:void ensureArrayElementIsMutable():3530:3532 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.internal.kg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.internal.ng1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type[] $VALUES -> o
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type BYTE -> b
     int value -> a
@@ -103861,7 +103973,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annot
     11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2532:2532 -> d
     12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2531:2531 -> d
     13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2530:2530 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.internal.ng1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.internal.qg1:
     java.util.List argument_ -> d
     int bitField0_ -> b
     int id_ -> c
@@ -103899,7 +104011,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annot
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation build():4371:4371 -> g
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation buildPartial():4377:4389 -> h
     1:3:void ensureArgumentIsMutable():4481:4483 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.internal.sg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.internal.vg1:
     java.util.List sealedSubclassFqName_ -> r
     int nestedClassNameMemoizedSerializedSize -> l
     java.util.List typeAlias_ -> p
@@ -104104,11 +104216,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class
     1:1:java.util.List getSupertypeIdList():9102:9102 -> x
     1:1:java.util.List getSupertypeList():9066:9066 -> y
     1:1:java.util.List getTypeAliasList():9252:9252 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.internal.pg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.internal.sg1:
     1:1:void <init>():8830:8830 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8835:8835 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8830 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.internal.qg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.internal.tg1:
     java.util.List sealedSubclassFqName_ -> q
     java.util.List enumEntry_ -> p
     java.util.List typeAlias_ -> o
@@ -104249,7 +104361,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class
     1:3:void ensureTypeAliasIsMutable():11118:11120 -> p
     1:3:void ensureTypeParameterIsMutable():10361:10363 -> q
     1:3:void ensureVersionRequirementIsMutable():11617:11619 -> r
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.internal.rg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.internal.ug1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind CLASS -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind ENUM_CLASS -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind INTERFACE -> c
@@ -104264,7 +104376,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class
     1:2:void <init>(java.lang.String,int,int,int):8946:8947 -> <init>
     1:1:int getNumber():8917:8917 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind[] values():8847:8847 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.internal.vg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.internal.yg1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     java.util.List versionRequirement_ -> f
     java.util.List valueParameter_ -> e
@@ -104326,11 +104438,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Const
     1:1:boolean hasFlags():13794:13794 -> o
     1:3:void initFields():13880:13882 -> p
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilder():14012:14012 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.internal.tg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.internal.wg1:
     1:1:void <init>():13766:13766 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13771:13771 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13766 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.internal.ug1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.internal.xg1:
     java.util.List valueParameter_ -> f
     int bitField0_ -> d
     int flags_ -> e
@@ -104367,7 +104479,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Const
     1:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor buildPartial():14066:14083 -> h
     1:3:void ensureValueParameterIsMutable():14214:14216 -> i
     1:3:void ensureVersionRequirementIsMutable():14338:14340 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.internal.yg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.internal.Bg1:
     java.util.List effect_ -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract defaultInstance -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -104416,11 +104528,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contr
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder toBuilder():23852 -> k
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23850:23850 -> k
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder toBuilder():23852 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.internal.wg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.internal.zg1:
     1:1:void <init>():23695:23695 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23700:23700 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23695 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.internal.xg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.internal.Ag1:
     java.util.List effect_ -> c
     int bitField0_ -> b
     1:91:void <init>():23864:23954 -> <init>
@@ -104455,7 +104567,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contr
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder access$22600():23857 -> f
     1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract buildPartial():23898:23904 -> g
     1:3:void ensureEffectIsMutable():23957:23959 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.internal.Dg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.internal.Gg1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType effectType_ -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     java.util.List effectConstructorArgument_ -> d
@@ -104519,11 +104631,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effec
     1:1:boolean hasKind():24522:24522 -> n
     1:4:void initFields():24532:24535 -> o
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder newBuilder():24664:24664 -> p
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.internal.zg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.internal.Cg1:
     1:1:void <init>():24262:24262 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):24267:24267 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):24262 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.internal.Ag1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.internal.Dg1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType effectType_ -> c
     java.util.List effectConstructorArgument_ -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression conclusionOfConditionalEffect_ -> e
@@ -104568,7 +104680,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effec
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder access$23100():24674 -> f
     1:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect buildPartial():24721:24741 -> g
     1:3:void ensureEffectConstructorArgumentIsMutable():24844:24846 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.internal.Bg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.internal.Eg1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType CALLS -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType RETURNS_NOT_NULL -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType[] $VALUES -> e
@@ -104581,7 +104693,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effec
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24349:24349 -> d
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24348:24348 -> d
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24347:24347 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.internal.Cg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.internal.Fg1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind AT_MOST_ONCE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind EXACTLY_ONCE -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind[] $VALUES -> e
@@ -104594,7 +104706,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effec
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24414:24414 -> d
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24413:24413 -> d
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24412:24412 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.internal.Gg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.internal.Jg1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int memoizedSerializedSize -> f
@@ -104637,11 +104749,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumE
     1:1:boolean hasName():20856:20856 -> m
     1:1:void initFields():20866:20866 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilder():20971:20971 -> o
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.internal.Eg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.internal.Hg1:
     1:1:void <init>():20835:20835 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20840:20840 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20835 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.internal.Fg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.internal.Ig1:
     int bitField0_ -> d
     int name_ -> e
     1:1:void <init>():20987:20987 -> <init>
@@ -104672,7 +104784,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumE
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.create():20994:20994 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder access$19500():20981 -> g
     1:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry buildPartial():21021:21028 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.internal.Kg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.internal.Ng1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     int memoizedSerializedSize -> k
     int isInstanceTypeId_ -> g
@@ -104759,11 +104871,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expre
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder toBuilder():25864 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25862:25862 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder toBuilder():25864 -> v
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.internal.Hg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.internal.Kg1:
     1:1:void <init>():25381:25381 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25386:25386 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25381 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.internal.Ig1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.internal.Lg1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue constantValue_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type isInstanceType_ -> f
     int isInstanceTypeId_ -> g
@@ -104821,7 +104933,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expre
     1:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression buildPartial():25927:25960 -> h
     1:3:void ensureAndArgumentIsMutable():26311:26313 -> i
     1:3:void ensureOrArgumentIsMutable():26508:26510 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.internal.Jg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.internal.Mg1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue NULL -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue TRUE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue[] $VALUES -> e
@@ -104834,7 +104946,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expre
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25434:25434 -> d
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25433:25433 -> d
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25432:25432 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.internal.Ng1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.internal.Qg1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function defaultInstance -> r
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int receiverTypeId_ -> k
@@ -104961,11 +105073,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Funct
     1:1:boolean hasContract():15078:15078 -> x
     1:1:boolean hasFlags():14839:14839 -> y
     1:1:boolean hasName():14884:14884 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.internal.Lg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.internal.Og1:
     1:1:void <init>():14803:14803 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14808:14808 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14803 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.internal.Mg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.internal.Pg1:
     int receiverTypeId_ -> l
     java.util.List versionRequirement_ -> o
     int returnTypeId_ -> i
@@ -105075,7 +105187,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Funct
     1:3:void ensureTypeParameterIsMutable():15839:15841 -> j
     1:3:void ensureValueParameterIsMutable():16056:16058 -> k
     1:3:void ensureVersionRequirementIsMutable():16240:16242 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.internal.Og1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.internal.Rg1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind SYNTHESIZED -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind FAKE_OVERRIDE -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind DELEGATION -> d
@@ -105087,7 +105199,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Membe
     1:2:void <init>(java.lang.String,int,int,int):268:269 -> <init>
     1:1:int getNumber():242:242 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind[] values():196:196 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality -> com.android.tools.r8.internal.Pg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality -> com.android.tools.r8.internal.Sg1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality ABSTRACT -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality SEALED -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality FINAL -> b
@@ -105099,7 +105211,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modal
     1:2:void <init>(java.lang.String,int,int,int):86:87 -> <init>
     1:1:int getNumber():60:60 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality[] values():14:14 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.internal.Sg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.internal.Vg1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> h
     byte memoizedIsInitialized -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -105180,11 +105292,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Packa
     1:1:boolean hasVersionRequirementTable():12115:12115 -> r
     1:5:void initFields():12125:12129 -> s
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder newBuilder():12286:12286 -> t
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.internal.Qg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.internal.Tg1:
     1:1:void <init>():11974:11974 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11979:11979 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11974 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.internal.Rg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.internal.Ug1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> i
     java.util.List property_ -> f
     java.util.List function_ -> e
@@ -105244,7 +105356,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Packa
     1:3:void ensureFunctionIsMutable():12472:12474 -> j
     1:3:void ensurePropertyIsMutable():12597:12599 -> k
     1:3:void ensureTypeAliasIsMutable():12722:12724 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.internal.Vg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.internal.Yg1:
     int setterFlags_ -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter setterValueParameter_ -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -105361,11 +105473,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Prope
     1:1:boolean hasFlags():16809:16809 -> x
     1:1:boolean hasGetterFlags():16992:16992 -> y
     1:1:boolean hasName():16855:16855 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.internal.Tg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.internal.Wg1:
     1:1:void <init>():16772:16772 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16777:16777 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16772 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.internal.Ug1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.internal.Xg1:
     int getterFlags_ -> n
     int setterFlags_ -> o
     int receiverTypeId_ -> l
@@ -105469,7 +105581,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Prope
     1:54:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property buildPartial():17361:17414 -> i
     1:3:void ensureTypeParameterIsMutable():17786:17788 -> j
     1:3:void ensureVersionRequirementIsMutable():18174:18176 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.internal.ch1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.internal.fh1:
     int outerTypeId_ -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int typeAliasName_ -> l
@@ -105600,11 +105712,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type
     1:1:int getTypeParameter():5807:5807 -> x
     1:1:int getTypeParameterName():5830:5830 -> y
     1:1:boolean hasAbbreviatedType():5902:5902 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.internal.Wg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.internal.Zg1:
     1:1:void <init>():4972:4972 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):4977:4977 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):4972 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.internal.ah1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.internal.dh1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument defaultInstance -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection projection_ -> c
@@ -105658,11 +105770,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$
     1:1:boolean hasTypeId():5257:5257 -> m
     1:3:void initFields():5267:5269 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder newBuilder():5385:5385 -> o
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.internal.Xg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.internal.ah1:
     1:1:void <init>():5124:5124 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):5129:5129 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):5124 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.internal.Yg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.internal.bh1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection projection_ -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type type_ -> d
     int typeId_ -> e
@@ -105706,7 +105818,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.create():5409:5409 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder access$5000():5395 -> f
     1:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument buildPartial():5440:5455 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.internal.Zg1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.internal.ch1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection STAR -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection IN -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection OUT -> c
@@ -105721,7 +105833,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5185:5185 -> d
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5184:5184 -> d
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5183:5183 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.internal.bh1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.internal.eh1:
     int outerTypeId_ -> o
     int typeParameterName_ -> l
     int typeAliasName_ -> m
@@ -105841,7 +105953,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type build():6253:6253 -> h
     1:61:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type buildPartial():6259:6319 -> i
     1:3:void ensureArgumentIsMutable():6434:6436 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.internal.fh1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.internal.ih1:
     int memoizedSerializedSize -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int expandedTypeId_ -> j
@@ -105945,11 +106057,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeA
     1:1:boolean hasName():19524:19524 -> x
     1:1:boolean hasUnderlyingType():19574:19574 -> y
     1:1:boolean hasUnderlyingTypeId():19589:19589 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.internal.dh1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.internal.gh1:
     1:1:void <init>():19478:19478 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19483:19483 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19478 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.internal.eh1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.internal.hh1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type expandedType_ -> j
     int expandedTypeId_ -> k
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type underlyingType_ -> h
@@ -106028,7 +106140,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeA
     1:3:void ensureAnnotationIsMutable():20519:20521 -> j
     1:3:void ensureTypeParameterIsMutable():20210:20212 -> k
     1:3:void ensureVersionRequirementIsMutable():20643:20645 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.internal.jh1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.internal.mh1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int memoizedSerializedSize -> l
     int upperBoundIdMemoizedSerializedSize -> j
@@ -106113,11 +106225,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeP
     1:1:boolean hasVariance():7510:7510 -> u
     1:6:void initFields():7578:7583 -> v
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder newBuilder():7751:7751 -> w
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.internal.gh1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.internal.jh1:
     1:1:void <init>():7379:7379 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):7384:7384 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):7379 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.internal.hh1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.internal.kh1:
     int name_ -> f
     java.util.List upperBoundId_ -> j
     java.util.List upperBound_ -> i
@@ -106165,7 +106277,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeP
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter build():7805:7805 -> h
     1:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter buildPartial():7811:7840 -> i
     1:3:void ensureUpperBoundIsMutable():8059:8061 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.internal.ih1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.internal.lh1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance IN -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance[] $VALUES -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance OUT -> c
@@ -106178,7 +106290,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeP
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7432:7432 -> d
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7431:7431 -> d
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7430:7430 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.internal.mh1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.internal.ph1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     java.util.List type_ -> c
@@ -106233,11 +106345,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeT
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder toBuilder():13288 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):13286:13286 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder toBuilder():13288 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.internal.kh1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.internal.nh1:
     1:1:void <init>():13097:13097 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13102:13102 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13097 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.internal.lh1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.internal.oh1:
     java.util.List type_ -> c
     int firstNullable_ -> d
     int bitField0_ -> b
@@ -106269,7 +106381,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeT
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder.create():13307:13307 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder access$12100():13293 -> f
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable buildPartial():13336:13348 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.internal.ph1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.internal.sh1:
     byte memoizedIsInitialized -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter defaultInstance -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -106349,11 +106461,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Value
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder toBuilder():18752 -> z
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18750:18750 -> z
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder toBuilder():18752 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.internal.nh1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.internal.qh1:
     1:1:void <init>():18466:18466 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18471:18471 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18466 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.internal.oh1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.internal.rh1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type varargElementType_ -> i
     int varargElementTypeId_ -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type type_ -> g
@@ -106423,7 +106535,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Value
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter build():18801 -> h
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter build():18801:18801 -> h
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter buildPartial():18807:18834 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.internal.uh1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.internal.xh1:
     byte memoizedIsInitialized -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -106487,11 +106599,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Versi
     1:1:boolean hasVersionKind():21617:21617 -> s
     1:6:void initFields():21632:21637 -> t
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder newBuilder():21768:21768 -> u
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.internal.qh1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.internal.th1:
     1:1:void <init>():21340:21340 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21345:21345 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21340 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.internal.rh1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.internal.uh1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> e
     int errorCode_ -> f
     int message_ -> g
@@ -106545,7 +106657,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Versi
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.create():21792:21792 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder access$20100():21778 -> f
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement buildPartial():21829:21856 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.internal.sh1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.internal.vh1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level[] $VALUES -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level HIDDEN -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level ERROR -> c
@@ -106558,7 +106670,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Versi
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21393:21393 -> d
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21392:21392 -> d
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21391:21391 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.internal.th1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.internal.wh1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind COMPILER_VERSION -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind LANGUAGE_VERSION -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind API_VERSION -> d
@@ -106571,7 +106683,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Versi
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21458:21458 -> d
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21457:21457 -> d
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21456:21456 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.internal.xh1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.internal.Ah1:
     java.util.List requirement_ -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> f
@@ -106616,11 +106728,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Versi
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder toBuilder():22478 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):22476:22476 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder toBuilder():22478 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.internal.vh1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.internal.yh1:
     1:1:void <init>():22327:22327 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22332:22332 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22327 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.internal.wh1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.internal.zh1:
     java.util.List requirement_ -> c
     int bitField0_ -> b
     1:85:void <init>():22490:22574 -> <init>
@@ -106655,7 +106767,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Versi
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder access$21200():22483 -> f
     1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable buildPartial():22524:22530 -> g
     1:3:void ensureRequirementIsMutable():22577:22579 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.internal.yh1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.internal.Bh1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility LOCAL -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility PRIVATE_TO_THIS -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility PUBLIC -> e
@@ -106669,7 +106781,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visib
     1:2:void <init>(java.lang.String,int,int,int):186:187 -> <init>
     1:1:int getNumber():158:158 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility[] values():96:96 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.BinaryVersion -> com.android.tools.r8.internal.BB0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.BinaryVersion -> com.android.tools.r8.internal.EB0:
 # {"id":"sourceFile","fileName":"BinaryVersion.kt"}
     java.util.List rest -> e
     int patch -> d
@@ -106687,7 +106799,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserializatio
     1:1:java.lang.String toString():65 -> toString
     2:6:java.lang.String toString():93:97 -> toString
     7:7:java.lang.String toString():66:66 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags -> com.android.tools.r8.internal.CP0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags -> com.android.tools.r8.internal.FP0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_CROSSINLINE -> q
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField DECLARES_DEFAULT_VALUE -> p
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_NOT_DEFAULT -> s
@@ -106784,15 +106896,15 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserializatio
     4:4:int getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):199 -> a
     5:5:int getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):199:199 -> a
     6:6:int getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):0:0 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$1 -> com.android.tools.r8.internal.yP0:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField -> com.android.tools.r8.internal.zP0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$1 -> com.android.tools.r8.internal.BP0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField -> com.android.tools.r8.internal.CP0:
     1:1:void <init>(int):269:269 -> <init>
     1:1:java.lang.Object get(int):266:266 -> a
     2:2:int toFlags(java.lang.Boolean):280:280 -> a
     1:1:java.lang.Boolean get(int):275:275 -> b
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField.$$$reportNull$$$0(int):0:0 -> b
     2:2:java.lang.Boolean get(int):275 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField -> com.android.tools.r8.internal.AP0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField -> com.android.tools.r8.internal.DP0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[] values -> c
     1:2:void <init>(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[]):290:291 -> <init>
     1:6:int bitWidth(java.lang.Object[]):295:300 -> a
@@ -106800,26 +106912,26 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserializatio
     7:7:int bitWidth(java.lang.Object[]):0 -> a
     8:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.get(int):306:310 -> a
     8:12:java.lang.Object get(int):286 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField -> com.android.tools.r8.internal.BP0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField -> com.android.tools.r8.internal.EP0:
     int bitWidth -> b
     int offset -> a
     1:1:void <init>(int,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$1):234:234 -> <init>
     2:4:void <init>(int,int):256:258 -> <init>
     java.lang.Object get(int) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField booleanFirst():245:245 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver -> com.android.tools.r8.internal.p91:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver -> com.android.tools.r8.internal.s91:
 # {"id":"sourceFile","fileName":"NameResolver.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoBufUtilKt -> com.android.tools.r8.internal.zh1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoBufUtilKt -> com.android.tools.r8.internal.Ch1:
 # {"id":"sourceFile","fileName":"ProtoBufUtil.kt"}
     1:1:java.lang.Object getExtensionOrNull(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):12:12 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt -> com.android.tools.r8.internal.ai1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt -> com.android.tools.r8.internal.di1:
 # {"id":"sourceFile","fileName":"protoTypeTableUtil.kt"}
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type receiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):56:57 -> a
     3:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type receiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):70:71 -> a
     5:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type type(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):76:78 -> a
     1:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type returnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):48:50 -> b
     4:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type returnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):62:64 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.internal.Fr1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.internal.xr1:
 # {"id":"sourceFile","fileName":"TypeTable.kt"}
     java.util.List types -> a
     1:20:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):21:40 -> <init>
@@ -106827,7 +106939,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserializatio
     22:35:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):27:40 -> <init>
     36:36:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):22:22 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type get(int):34:34 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement -> com.android.tools.r8.internal.Ts1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement -> com.android.tools.r8.internal.Ms1:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version version -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind kind -> b
@@ -106841,7 +106953,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserializatio
     1:1:java.lang.String getMessage():29:29 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version getVersion():25:25 -> e
     1:1:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version -> com.android.tools.r8.internal.Ss1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version -> com.android.tools.r8.internal.Ls1:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     int minor -> b
     int patch -> c
@@ -106856,7 +106968,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserializatio
     int component3() -> c
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version.asString():33:33 -> toString
     1:1:java.lang.String toString():50 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable -> com.android.tools.r8.internal.Vs1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable -> com.android.tools.r8.internal.Os1:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     java.util.List infos -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion Companion -> b
@@ -106873,14 +106985,14 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserializatio
     5:5:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.getOrNull(java.util.List,int):304:304 -> a
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement get(int):12 -> a
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement get(int):12:12 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion -> com.android.tools.r8.internal.Us1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion -> com.android.tools.r8.internal.Ns1:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     1:1:void <init>():14:14 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:18 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.getEMPTY():15:15 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18 -> a
     3:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:18 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.internal.a01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.internal.d01:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension constructorSignature -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension propertySignature -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension flags -> e
@@ -106896,8 +107008,8 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBu
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension anonymousObjectOriginName -> k
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension packageLocalVariable -> n
     1:233:void <clinit>():3801:4033 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1 -> com.android.tools.r8.internal.JZ0:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.internal.MZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1 -> com.android.tools.r8.internal.MZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.internal.PZ0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature defaultInstance -> g
@@ -106948,11 +107060,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBu
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder toBuilder():2834 -> n
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2832:2832 -> n
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder toBuilder():2834 -> n
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.internal.KZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.internal.NZ0:
     1:1:void <init>():2671:2671 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2676:2676 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2671 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder -> com.android.tools.r8.internal.LZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder -> com.android.tools.r8.internal.OZ0:
     int desc_ -> d
     int bitField0_ -> b
     int name_ -> c
@@ -106986,7 +107098,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBu
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.create():2853:2853 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder access$2500():2839 -> f
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature buildPartial():2882:2893 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.internal.PZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.internal.SZ0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature defaultInstance -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -107037,11 +107149,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBu
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder toBuilder():2372 -> n
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2370:2370 -> n
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder toBuilder():2372 -> n
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.internal.NZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.internal.QZ0:
     1:1:void <init>():2209:2209 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2214:2214 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2209 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder -> com.android.tools.r8.internal.OZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder -> com.android.tools.r8.internal.RZ0:
     int desc_ -> d
     int bitField0_ -> b
     int name_ -> c
@@ -107075,7 +107187,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBu
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.create():2391:2391 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder access$1800():2377 -> f
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature buildPartial():2420:2431 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.internal.SZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.internal.VZ0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getter_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature setter_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -107131,11 +107243,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBu
     1:1:boolean hasSyntheticMethod():3233:3233 -> o
     1:4:void initFields():3277:3280 -> p
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder newBuilder():3397:3397 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.internal.QZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.internal.TZ0:
     1:1:void <init>():3193:3193 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3198:3198 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3193 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.internal.RZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.internal.UZ0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getter_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature setter_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature syntheticMethod_ -> d
@@ -107215,7 +107327,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBu
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.create():3421:3421 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder access$3200():3407 -> f
     1:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature buildPartial():3454:3473 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.internal.ZZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.internal.c01:
     java.util.List record_ -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -107267,11 +107379,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBu
     1:1:java.util.List getRecordList():1569:1569 -> i
     1:2:void initFields():1634:1635 -> j
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder newBuilder():1752:1752 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.internal.TZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.internal.WZ0:
     1:1:void <init>():172:172 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):177:177 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):172 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder -> com.android.tools.r8.internal.UZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder -> com.android.tools.r8.internal.XZ0:
     java.util.List localName_ -> d
     java.util.List record_ -> c
     int bitField0_ -> b
@@ -107301,7 +107413,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBu
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes buildPartial():1805:1816 -> g
     1:3:void ensureLocalNameIsMutable():1997:1999 -> h
     1:3:void ensureRecordIsMutable():1873:1875 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.internal.YZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.internal.b01:
     int memoizedSerializedSize -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     int replaceCharMemoizedSerializedSize -> j
@@ -107405,11 +107517,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBu
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder toBuilder():943 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):941:941 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder toBuilder():943 -> v
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.internal.VZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.internal.YZ0:
     1:1:void <init>():471:471 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):476:476 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):471 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder -> com.android.tools.r8.internal.WZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder -> com.android.tools.r8.internal.ZZ0:
     java.lang.Object string_ -> e
     int predefinedIndex_ -> d
     java.util.List replaceChar_ -> h
@@ -107462,7 +107574,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBu
     1:1:int getSubstringIndexCount():1373:1373 -> j
     1:1:boolean hasOperation():1301:1301 -> k
     1:1:boolean hasPredefinedIndex():1153:1153 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.internal.XZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.internal.a01:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation NONE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation[] $VALUES -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation DESC_TO_CLASS_ID -> d
@@ -107475,7 +107587,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBu
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):544:544 -> d
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):543:543 -> d
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):542:542 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.internal.JB0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.internal.MB0:
     boolean FORCE_8TO7_ENCODING -> a
     boolean $assertionsDisabled -> b
     1:13:void <clinit>():15:27 -> <clinit>
@@ -107502,7 +107614,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserializ
     185:201:byte[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding.decode7to8(byte[]):247:263 -> a
     185:201:byte[] decodeBytes(java.lang.String[]):192 -> a
     1:2:java.lang.String[] dropMarker(java.lang.String[]):199:200 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.internal.NG0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.internal.QG0:
 # {"id":"sourceFile","fileName":"ClassMapperLite.kt"}
     java.util.Map map -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite INSTANCE -> a
@@ -107513,12 +107625,12 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserializ
     1:1:void <init>():15:15 -> <init>
     1:1:void map$lambda-0$add(java.util.Map,java.lang.String,java.lang.String):42:42 -> a
     2:2:java.lang.String mapClass(java.lang.String):80:80 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature -> com.android.tools.r8.internal.qZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature -> com.android.tools.r8.internal.tZ0:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     1:1:void <init>():14:14 -> <init>
     java.lang.String asString() -> a
     1:1:java.lang.String toString():27:27 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field -> com.android.tools.r8.internal.nZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field -> com.android.tools.r8.internal.qZ0:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -107544,7 +107656,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserializ
     3:3:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field.getDesc():23:23 -> hashCode
     3:3:int hashCode():0 -> hashCode
     4:4:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method -> com.android.tools.r8.internal.oZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method -> com.android.tools.r8.internal.rZ0:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -107568,7 +107680,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserializ
     3:3:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method.getDesc():19:19 -> hashCode
     3:3:int hashCode():0 -> hashCode
     4:4:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion -> com.android.tools.r8.internal.BZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion -> com.android.tools.r8.internal.EZ0:
 # {"id":"sourceFile","fileName":"JvmMetadataVersion.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion INSTANCE -> g
     boolean isStrictSemantics -> f
@@ -107580,7 +107692,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserializ
     7:7:void <clinit>():32 -> <clinit>
     1:1:void <init>(int[],boolean):14:14 -> <init>
     1:6:boolean isCompatible():19:24 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.internal.EZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.internal.HZ0:
 # {"id":"sourceFile","fileName":"JvmNameResolver.kt"}
     java.util.Set localNameIndices -> c
     java.util.List PREDEFINED_STRINGS -> f
@@ -107600,10 +107712,10 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserializ
     1:1:java.lang.String[] getStrings():15:15 -> b
     2:2:boolean isLocalClassName(int):77:77 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes getTypes():14:14 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion -> com.android.tools.r8.internal.DZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion -> com.android.tools.r8.internal.GZ0:
 # {"id":"sourceFile","fileName":"JvmNameResolver.kt"}
     1:1:void <init>():79:79 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.internal.b01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.internal.e01:
 # {"id":"sourceFile","fileName":"JvmProtoBufUtil.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil INSTANCE -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite EXTENSION_REGISTRY -> b
@@ -107647,7 +107759,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserializ
     4:4:com.android.tools.r8.jetbrains.kotlin.Pair readPackageDataFrom(java.lang.String[],java.lang.String[]):37 -> c
     5:5:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readPackageDataFrom(byte[],java.lang.String[]):42:42 -> c
     5:5:com.android.tools.r8.jetbrains.kotlin.Pair readPackageDataFrom(java.lang.String[],java.lang.String[]):37 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable -> com.android.tools.r8.internal.c01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable -> com.android.tools.r8.internal.f01:
 # {"id":"sourceFile","fileName":"JvmStringTable.kt"}
     java.util.LinkedHashSet localNames -> d
     java.util.ArrayList records -> b
@@ -107696,7 +107808,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serializat
     752:752:void serializeTo(java.io.OutputStream):98 -> a
     753:753:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder.build():1799:1799 -> a
     753:753:void serializeTo(java.io.OutputStream):98 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner -> com.android.tools.r8.internal.DX0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner -> com.android.tools.r8.internal.GX0:
 # {"id":"sourceFile","fileName":"Interner.kt"}
     java.util.HashMap interned -> b
     int firstIndex -> a
@@ -107706,13 +107818,13 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.
     21:21:int intern(java.lang.Object):26 -> a
     22:24:int intern(java.lang.Object):26:26 -> a
     1:1:boolean isEmpty():16:16 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner$special$$inlined$sortedBy$1 -> com.android.tools.r8.internal.CX0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner$special$$inlined$sortedBy$1 -> com.android.tools.r8.internal.FX0:
 # {"id":"sourceFile","fileName":"Comparisons.kt"}
     java.util.HashMap $receiver$inlined -> a
     1:1:int compare(java.lang.Object,java.lang.Object):321:321 -> compare
     2:2:int com.android.tools.r8.jetbrains.kotlin.comparisons.ComparisonsKt__ComparisonsKt.compareValues(java.lang.Comparable,java.lang.Comparable):78:78 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):321 -> compare
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable -> com.android.tools.r8.internal.n91:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable -> com.android.tools.r8.internal.q91:
 # {"id":"sourceFile","fileName":"MutableTable.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.interner -> a
     1:6:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.<init>():23:28 -> <init>
@@ -107751,7 +107863,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.
     69:69:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.serialize():40:40 -> a
     69:69:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.serialize():0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.TableElementWrapper -> com.android.tools.r8.internal.oq1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.TableElementWrapper -> com.android.tools.r8.internal.gq1:
 # {"id":"sourceFile","fileName":"MutableTable.kt"}
     byte[] bytes -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder builder -> a
@@ -107836,7 +107948,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractParser
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractParser.parsePartialFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):196:196 -> b
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractParser.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):209 -> b
     6:6:java.lang.Object parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):49 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString -> com.android.tools.r8.internal.HC0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString -> com.android.tools.r8.internal.KC0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString EMPTY -> a
     boolean $assertionsDisabled -> b
     1:22:void <clinit>():60:81 -> <clinit>
@@ -107863,9 +107975,9 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString ->
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output newOutput():751:751 -> d
     int peekCachedHashCode() -> e
     1:1:java.lang.String toString():1019:1019 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator -> com.android.tools.r8.internal.FC0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator -> com.android.tools.r8.internal.IC0:
     byte nextByte() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output -> com.android.tools.r8.internal.GC0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output -> com.android.tools.r8.internal.JC0:
     int bufferPos -> e
     byte[] buffer -> d
     java.util.ArrayList flushedBuffers -> b
@@ -107890,7 +108002,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Out
     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.internal.hI0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.internal.kI0:
     byte[] buffer -> a
     int currentLimit -> h
     int recursionDepth -> i
@@ -107998,7 +108110,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStre
     7:7:int readTag():158 -> p
     8:8:int readTag():158:158 -> p
     1:8:void recomputeBufferSizeAfterLimit():1001:1008 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.internal.jI0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.internal.mI0:
     byte[] buffer -> a
     java.io.OutputStream output -> e
     int totalBytesWritten -> d
@@ -108095,9 +108207,9 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStr
     1:6:void writeRawByte(int):1042 -> f
     1:4:void writeRawLittleEndian32(int):1246:1249 -> g
     1:4:void writeRawVarint32(int):1195:1198 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.internal.iI0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.internal.lI0:
     1:1:void <init>():1016:1016 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.internal.tO0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.internal.wO0:
     java.util.Map extensionsByNumber -> a
     int $r8$clinit -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite EMPTY -> b
@@ -108115,13 +108227,13 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegis
     6:6:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getNumber():830 -> a
     6:6:void add(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):125 -> a
     7:7:void add(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):125:125 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite$ObjectIntPair -> com.android.tools.r8.internal.sO0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite$ObjectIntPair -> com.android.tools.r8.internal.vO0:
     java.lang.Object object -> a
     int number -> b
     1:3:void <init>(java.lang.Object,int):167:169 -> <init>
     1:5:boolean equals(java.lang.Object):178:182 -> equals
     1:1:int hashCode():174:174 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet -> com.android.tools.r8.internal.eP0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet -> com.android.tools.r8.internal.hP0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet DEFAULT_INSTANCE -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap fields -> a
     boolean isImmutable -> b
@@ -108374,8 +108486,8 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet -> co
     1:5:java.util.Iterator iterator():197:201 -> e
     1:5:void makeImmutable():107:111 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet newFieldSet():92:92 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.internal.dP0:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.internal.JQ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.internal.gP0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.internal.MQ0:
     1:1:void <init>():53:53 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):56:56 -> <init>
     1:1:boolean parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):73:73 -> a
@@ -108467,15 +108579,15 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessa
     144:144:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension newSingularGeneratedExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Class):639:639 -> a
     145:146:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension newRepeatedGeneratedExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean,java.lang.Class):661:662 -> a
     147:149:java.lang.reflect.Method getMethodOrDie(java.lang.Class,java.lang.String,java.lang.Class[]):735:737 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$1 -> com.android.tools.r8.internal.CQ0:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.internal.DQ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$1 -> com.android.tools.r8.internal.FQ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.internal.GQ0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     1:45:void <init>():87:131 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder setUnknownFields(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):127:127 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType() -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString getUnknownFields():123:123 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder -> com.android.tools.r8.internal.EQ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder -> com.android.tools.r8.internal.HQ0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet extensions -> b
     boolean extensionsIsMutable -> c
     1:3:void <init>():332:334 -> <init>
@@ -108508,7 +108620,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessa
     19:19:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):371:371 -> b
     19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):431 -> b
     1:3:void ensureExtensionsIsMutable():350:352 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.internal.GQ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.internal.JQ0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet extensions -> a
     1:2:void <init>():171:172 -> <init>
     3:4:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):175:176 -> <init>
@@ -108544,7 +108656,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessa
     1:1:int extensionsSerializedSize():316:316 -> h
     1:1:void makeExtensionsImmutable():261:261 -> i
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter newExtensionWriter():308:308 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter -> com.android.tools.r8.internal.FQ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter -> com.android.tools.r8.internal.IQ0:
     java.util.Map$Entry next -> b
     java.util.Iterator iter -> a
     boolean messageSetWireFormat -> c
@@ -108580,7 +108692,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessa
     14:14:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeMessageSetExtension(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):355 -> a
     14:14:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):293 -> a
     15:20:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):296:301 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.internal.HQ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.internal.KQ0:
     boolean isPacked -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap enumTypeMap -> a
     int number -> b
@@ -108591,7 +108703,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessa
     1:1:int compareTo(java.lang.Object):671:671 -> compareTo
     2:2:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.compareTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor):725:725 -> compareTo
     2:2:int compareTo(java.lang.Object):671 -> compareTo
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension -> com.android.tools.r8.internal.IQ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension -> com.android.tools.r8.internal.LQ0:
     java.lang.Object defaultValue -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor descriptor -> d
     java.lang.reflect.Method enumValueOf -> e
@@ -108613,14 +108725,14 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessa
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteJavaType():702:702 -> b
     2:2:java.lang.Object singularToFieldSetType(java.lang.Object):885 -> b
     3:4:java.lang.Object singularToFieldSetType(java.lang.Object):885:886 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.internal.rX0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.internal.uX0:
     byte[] EMPTY_BYTE_ARRAY -> a
     1:6:void <clinit>():383:388 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.internal.pX0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.internal.sX0:
     int getNumber() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.internal.qX0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.internal.tX0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite findValueByNumber(int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.internal.LX0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.internal.OX0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite unfinishedMessage -> a
     1:1:void <init>(java.lang.String):46:46 -> <init>
     2:2:void <init>(java.lang.String):43:43 -> <init>
@@ -108629,14 +108741,14 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtoco
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException negativeSize():78:78 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException recursionLimitExceeded():104:104 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException truncatedMessage():70:70 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator -> com.android.tools.r8.internal.r41:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator -> com.android.tools.r8.internal.u41:
     java.util.Iterator iterator -> a
     1:2:void <init>(java.util.Iterator):130:131 -> <init>
     1:1:boolean hasNext():136:136 -> hasNext
     1:2:java.util.Map$Entry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator.next():142:143 -> next
     1:2:java.lang.Object next():127 -> next
     1:1:void remove():151:151 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.internal.q51:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.internal.t51:
     int hash -> d
     byte[] bytes -> c
     1:180:void <init>(byte[]):62:241 -> <init>
@@ -108668,8 +108780,8 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteStr
     1:9:int hashCode():251:259 -> hashCode
     1:1:java.util.Iterator iterator():52:52 -> iterator
     1:1:int size():76:76 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.internal.o51:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.internal.p51:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.internal.r51:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.internal.s51:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString this$0 -> c
     int limit -> b
     int position -> a
@@ -108680,12 +108792,12 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteStr
     1:1:java.lang.Byte com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator.next():325:325 -> next
     1:1:java.lang.Object next():310 -> next
     1:1:void remove():337:337 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.internal.j71:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.internal.m71:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType() -> a
     boolean isInitialized() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.internal.le1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.internal.oe1:
     java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString -> com.android.tools.r8.internal.lm1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString -> com.android.tools.r8.internal.dm1:
     int[] minLengthByDepth -> i
     int hash -> h
     int leftLength -> f
@@ -108735,8 +108847,8 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString.iterator():779:779 -> iterator
     1:1:java.util.Iterator iterator():70 -> iterator
     1:1:int size():269:269 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1 -> com.android.tools.r8.internal.hm1:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.internal.im1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1 -> com.android.tools.r8.internal.Zl1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.internal.am1:
     java.util.Stack prefixesStack -> a
     1:5:void <init>():602:606 -> <init>
     6:6:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1):602:602 -> <init>
@@ -108758,7 +108870,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString
     47:47:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer.insert(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):664:664 -> a
     47:47:void doBalance(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):629 -> a
     48:53:void doBalance(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):630:635 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.internal.jm1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.internal.bm1:
     java.util.Stack breadCrumbs -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1):716:716 -> <init>
@@ -108779,7 +108891,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString
     14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():762:762 -> l
     1:1:java.lang.Object next():716:716 -> next
     1:1:void remove():770:770 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.internal.km1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.internal.cm1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator bytes -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator pieces -> a
     int bytesRemaining -> c
@@ -108790,7 +108902,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString
     1:1:java.lang.Byte com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator.next():799:799 -> next
     1:1:java.lang.Object next():782 -> next
     1:1:void remove():811:811 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.internal.vn1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.internal.nn1:
     java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.entryList -> b
     java.util.Map com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.overflowEntries -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.lazyEntrySet -> e
@@ -108856,20 +108968,20 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap
     1:1:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.size():202:202 -> size
     1:1:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.size():0 -> size
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.internal.yn1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.internal.qn1:
     java.util.Iterator ITERATOR -> a
     java.lang.Iterable ITERABLE -> b
     1:16:void <clinit>():591:606 -> <clinit>
     1:1:java.util.Iterator access$700():589:589 -> a
     1:1:java.lang.Iterable iterable():615:615 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.internal.wn1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.internal.on1:
     1:1:void <init>():591:591 -> <init>
     1:1:java.lang.Object next():598:598 -> next
     1:1:void remove():602:602 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.internal.xn1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.internal.pn1:
     1:1:void <init>():606:606 -> <init>
     1:1:java.util.Iterator iterator():609:609 -> iterator
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.internal.zn1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.internal.rn1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> c
     java.lang.Object value -> b
     java.lang.Comparable key -> a
@@ -108893,7 +109005,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap
     1:1:int hashCode():452:452 -> hashCode
     1:3:java.lang.Object setValue(java.lang.Object):431:433 -> setValue
     1:1:java.lang.String toString():458:458 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.internal.An1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.internal.sn1:
     java.util.Iterator lazyOverflowIterator -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> d
     boolean nextCalledBeforeRemove -> b
@@ -108906,7 +109018,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap
     1:7:java.lang.Object next():532 -> next
     1:10:void remove():557:566 -> remove
     11:11:void remove():558:558 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.internal.Bn1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.internal.tn1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap):470:470 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1):470:470 -> <init>
@@ -108918,9 +109030,9 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap
     1:1:java.util.Iterator iterator():474:474 -> iterator
     1:3:boolean remove(java.lang.Object):514:516 -> remove
     1:1:int size():479:479 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException -> com.android.tools.r8.internal.Pr1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException -> com.android.tools.r8.internal.Hr1:
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):53:53 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8 -> com.android.tools.r8.internal.vs1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8 -> com.android.tools.r8.internal.os1:
     int incompleteStateFor(int,int) -> a
     int incompleteStateFor(int,int,int) -> a
     1:66:int partialIsValidUtf8(int,byte[],int,int):163:228 -> a
@@ -108929,10 +109041,10 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8 -> com.an
     1:1:int partialIsValidUtf8(byte[],int,int):252:252 -> b
     2:38:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8.partialIsValidUtf8NonAscii(byte[],int,int):270:306 -> b
     2:38:int partialIsValidUtf8(byte[],int,int):256 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.internal.Nt1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.internal.Gt1:
     int makeTag(int,int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.internal.Gt1:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.internal.Lt1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.internal.zt1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.internal.Et1:
     int wireType -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType DOUBLE -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType[] $VALUES -> u
@@ -108961,18 +109073,18 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$Fie
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType getJavaType():143:143 -> a
     1:1:int getWireType():144:144 -> b
     boolean isPackable() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.internal.Ht1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.internal.At1:
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType,int):116:116 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.internal.It1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.internal.Bt1:
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType,int):119:119 -> <init>
     boolean isPackable() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.internal.Jt1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.internal.Ct1:
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType,int):122:122 -> <init>
     boolean isPackable() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.internal.Kt1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.internal.Dt1:
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType,int):125:125 -> <init>
     boolean isPackable() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType -> com.android.tools.r8.internal.Mt1:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType -> com.android.tools.r8.internal.Ft1:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType BOOLEAN -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType STRING -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType FLOAT -> d
@@ -108987,7 +109099,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$Jav
     1:9:void <clinit>():78:86 -> <clinit>
     10:10:void <clinit>():77:77 -> <clinit>
     1:2:void <init>(java.lang.String,int,java.lang.Object):88:89 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor -> com.android.tools.r8.internal.dZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor -> com.android.tools.r8.internal.gZ0:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():78:78 -> <clinit>
@@ -109000,7 +109112,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor ->
     1:1:void visitEnd():68 -> b
     2:2:void visitEnd():68:68 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():54:54 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor -> com.android.tools.r8.internal.gZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor -> com.android.tools.r8.internal.jZ0:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> a
     1:1:void <clinit>():260:260 -> <clinit>
@@ -109008,14 +109120,14 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisit
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):236:236 -> <init>
     void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():240:240 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor -> com.android.tools.r8.internal.hZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor -> com.android.tools.r8.internal.kZ0:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor delegate -> a
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor):14:15 -> <init>
     void visitModuleName(java.lang.String) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor getDelegate():15:15 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):34:34 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt -> com.android.tools.r8.internal.jZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt -> com.android.tools.r8.internal.mZ0:
 # {"id":"sourceFile","fileName":"jvmExtensions.kt"}
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):19:19 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):71 -> a
@@ -109032,7 +109144,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt -> com.andro
     2:2:boolean isRaw(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):160:160 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getGetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):112:112 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):123:123 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.internal.kZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.internal.nZ0:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -109049,7 +109161,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature -> com.and
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature.getDesc():51:51 -> hashCode
     1:1:int hashCode():0 -> hashCode
     2:2:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor -> com.android.tools.r8.internal.mZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor -> com.android.tools.r8.internal.pZ0:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor delegate -> a
@@ -109060,14 +109172,14 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor
     2:2:void visitLambdaClassOriginName(java.lang.String):137:137 -> a
     3:3:void visitEnd():144:144 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():119:119 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.internal.pZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.internal.sZ0:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     1:1:void <init>():16:16 -> <init>
     java.lang.String asString() -> a
     java.lang.String getDesc() -> b
     java.lang.String getName() -> c
     1:1:java.lang.String toString():30:30 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature -> com.android.tools.r8.internal.CZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature -> com.android.tools.r8.internal.FZ0:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -109084,7 +109196,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature -> com.an
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature.getDesc():40:40 -> hashCode
     1:1:int hashCode():0 -> hashCode
     2:2:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor -> com.android.tools.r8.internal.GZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor -> com.android.tools.r8.internal.JZ0:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():108:108 -> <clinit>
@@ -109096,7 +109208,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor -
     1:1:void visitEnd():98 -> b
     2:2:void visitEnd():98:98 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():92:92 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor -> com.android.tools.r8.internal.IZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor -> com.android.tools.r8.internal.LZ0:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor delegate -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
@@ -109110,7 +109222,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor
     4:4:void visitSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):212:212 -> a
     5:5:void visitEnd():219:219 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():165:165 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeAliasExtensionVisitor -> com.android.tools.r8.internal.e01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeAliasExtensionVisitor -> com.android.tools.r8.internal.h01:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeAliasExtensionVisitor delegate -> a
@@ -109119,7 +109231,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeAliasExtensionVisitor
     3:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeAliasExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):355:355 -> <init>
     1:1:void visitEnd():365:365 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():359:359 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor -> com.android.tools.r8.internal.g01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor -> com.android.tools.r8.internal.j01:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor delegate -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
@@ -109130,7 +109242,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor -> c
     1:1:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):324:324 -> a
     2:2:void visitEnd():331:331 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():307:307 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.i01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.l01:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor delegate -> a
@@ -109140,7 +109252,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVis
     1:1:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):279:279 -> a
     2:2:void visitEnd():286:286 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():271:271 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmValueParameterExtensionVisitor -> com.android.tools.r8.internal.k01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmValueParameterExtensionVisitor -> com.android.tools.r8.internal.n01:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmValueParameterExtensionVisitor delegate -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
@@ -109149,7 +109261,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmValueParameterExtensionVi
     3:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmValueParameterExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):382:382 -> <init>
     1:1:void visitEnd():392:392 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():386:386 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.internal.x21:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.internal.A21:
 # {"id":"sourceFile","fileName":"KotlinClassHeader.kt"}
     java.lang.String packageName -> g
     java.lang.String extraString -> f
@@ -109228,7 +109340,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$cl
     5:5:java.lang.Object invoke():30 -> a
     6:6:com.android.tools.r8.jetbrains.kotlin.Pair invoke():32:32 -> a
     6:6:java.lang.Object invoke():30 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion -> com.android.tools.r8.internal.A21:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion -> com.android.tools.r8.internal.D21:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     1:1:void <init>():310:310 -> <init>
     1:3:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.checkMetadataVersion(int[]):345:347 -> a
@@ -109351,10 +109463,10 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Syntheti
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
     1:2:com.android.tools.r8.jetbrains.kotlin.Pair invoke():134:135 -> a
     1:2:java.lang.Object invoke():133 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Unknown -> com.android.tools.r8.internal.B21:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Unknown -> com.android.tools.r8.internal.E21:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):308:308 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension -> com.android.tools.r8.internal.cZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension -> com.android.tools.r8.internal.fZ0:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List localDelegatedProperties -> c
     java.lang.String anonymousObjectOriginName -> e
@@ -109376,7 +109488,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension -> co
     1:1:java.lang.String getAnonymousObjectOriginName():37:37 -> c
     1:1:java.util.List getLocalDelegatedProperties():35:35 -> d
     1:1:java.lang.String getModuleName():36:36 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension -> com.android.tools.r8.internal.fZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension -> com.android.tools.r8.internal.iZ0:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature signature -> b
     1:1:void <init>():133:133 -> <init>
@@ -109386,11 +109498,11 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature():134:134 -> a
     6:6:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):137:137 -> a
     1:1:void setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):134:134 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt -> com.android.tools.r8.internal.iZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt -> com.android.tools.r8.internal.lZ0:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):13:13 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):22:22 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension -> com.android.tools.r8.internal.lZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension -> com.android.tools.r8.internal.oZ0:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature signature -> c
     java.lang.String lambdaClassOriginName -> d
@@ -109402,7 +109514,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension ->
     8:8:void visitLambdaClassOriginName(java.lang.String):91:91 -> a
     1:1:java.lang.String getLambdaClassOriginName():84:84 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature():83:83 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions -> com.android.tools.r8.internal.AZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions -> com.android.tools.r8.internal.DZ0:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     1:1:void <init>():17:17 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17:17 -> a
@@ -109434,7 +109546,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions -
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension createTypeExtension():302:302 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension createTypeParameterExtension():300:300 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmValueParameterExtension createValueParameterExtension():306:306 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 -> com.android.tools.r8.internal.sZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 -> com.android.tools.r8.internal.vZ0:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder $proto -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
@@ -109442,21 +109554,21 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$w
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):123:123 -> a
     2:3:void visitModuleName(java.lang.String):128:129 -> a
     1:1:void visitAnonymousObjectOriginName(java.lang.String):118:118 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.rZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.uZ0:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder $proto -> a
     1:1:java.lang.Object invoke(java.lang.Object):123:123 -> a
     2:126:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:124 -> a
     2:126:java.lang.Object invoke(java.lang.Object):123 -> a
     127:127:java.lang.Object invoke(java.lang.Object):123:123 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeConstructorExtensions$1 -> com.android.tools.r8.internal.tZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeConstructorExtensions$1 -> com.android.tools.r8.internal.wZ0:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions this$0 -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder $proto -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):240:240 -> <init>
     1:1:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):243:243 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeFunctionExtensions$1 -> com.android.tools.r8.internal.uZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeFunctionExtensions$1 -> com.android.tools.r8.internal.xZ0:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions this$0 -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder $proto -> c
@@ -109464,21 +109576,21 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$w
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):165:165 -> <init>
     1:1:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):168:168 -> a
     2:2:void visitLambdaClassOriginName(java.lang.String):173:173 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 -> com.android.tools.r8.internal.wZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 -> com.android.tools.r8.internal.zZ0:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder $proto -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder):139:139 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):142:142 -> a
     2:3:void visitModuleName(java.lang.String):147:148 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.vZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.yZ0:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder $proto -> a
     1:1:java.lang.Object invoke(java.lang.Object):142:142 -> a
     2:145:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:143 -> a
     2:145:java.lang.Object invoke(java.lang.Object):142 -> a
     146:146:java.lang.Object invoke(java.lang.Object):142:142 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePropertyExtensions$1 -> com.android.tools.r8.internal.xZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePropertyExtensions$1 -> com.android.tools.r8.internal.AZ0:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions this$0 -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder signature -> d
@@ -109506,20 +109618,20 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$w
     35:35:void visitEnd():230 -> a
     36:36:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.build():3448:3448 -> a
     36:36:void visitEnd():230 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeExtensions$1 -> com.android.tools.r8.internal.yZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeExtensions$1 -> com.android.tools.r8.internal.BZ0:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder $proto -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):262:262 -> <init>
     1:1:void visit(boolean):265:265 -> a
     2:2:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):270:270 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeParameterExtensions$1 -> com.android.tools.r8.internal.zZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeParameterExtensions$1 -> com.android.tools.r8.internal.CZ0:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder $proto -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):253:253 -> <init>
     1:1:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):255:255 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension -> com.android.tools.r8.internal.FZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension -> com.android.tools.r8.internal.IZ0:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List localDelegatedProperties -> c
     java.lang.String moduleName -> d
@@ -109538,7 +109650,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension ->
     133:133:void visitModuleName(java.lang.String):69:69 -> a
     1:1:java.util.List getLocalDelegatedProperties():62:62 -> c
     1:1:java.lang.String getModuleName():63:63 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension -> com.android.tools.r8.internal.HZ0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension -> com.android.tools.r8.internal.KZ0:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature syntheticMethodForAnnotations -> g
     int jvmFlags -> c
@@ -109556,13 +109668,13 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension ->
     1:1:int getJvmFlags():103:103 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSetterSignature():106:106 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSyntheticMethodForAnnotations():107:107 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeAliasExtension -> com.android.tools.r8.internal.d01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeAliasExtension -> com.android.tools.r8.internal.g01:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     1:1:void <init>():180:180 -> <init>
     1:1:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):180:180 -> a
     2:4:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeAliasExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasExtensionVisitor):182:182 -> a
     2:4:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):180 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com.android.tools.r8.internal.f01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com.android.tools.r8.internal.i01:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List annotations -> d
     boolean isRaw -> c
@@ -109578,7 +109690,7 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com
     28:28:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):169:169 -> a
     1:1:java.util.List getAnnotations():162:162 -> b
     1:1:boolean isRaw():161:161 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension -> com.android.tools.r8.internal.h01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension -> com.android.tools.r8.internal.k01:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List annotations -> c
     1:2:void <init>():146:147 -> <init>
@@ -109591,13 +109703,13 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtensi
     45:45:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):146 -> a
     46:46:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):150:150 -> a
     1:1:java.util.List getAnnotations():147:147 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmValueParameterExtension -> com.android.tools.r8.internal.j01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmValueParameterExtension -> com.android.tools.r8.internal.m01:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     1:1:void <init>():187:187 -> <init>
     1:1:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):187:187 -> a
     2:4:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmValueParameterExtension.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterExtensionVisitor):189:189 -> a
     2:4:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):187 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt -> com.android.tools.r8.internal.l01:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt -> com.android.tools.r8.internal.o01:
 # {"id":"sourceFile","fileName":"jvmWriteUtils.kt"}
     1:3:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):14:16 -> a
     4:64:java.lang.String[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.writeData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable):0:60 -> a
@@ -109611,31 +109723,31 @@ com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt -> com.
     72:72:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):16 -> a
     73:78:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17:22 -> a
     79:86:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):15:22 -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmAnnotationVisitorProvider -> com.android.tools.r8.internal.U11:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmAnnotationVisitorProvider -> com.android.tools.r8.internal.X11:
     void get(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmContractVisitorProvider -> com.android.tools.r8.internal.V11:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectExpressionVisitorProvider -> com.android.tools.r8.internal.W11:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectVisitorProvider -> com.android.tools.r8.internal.X11:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmContractVisitorProvider -> com.android.tools.r8.internal.Y11:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectExpressionVisitorProvider -> com.android.tools.r8.internal.Z11:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectVisitorProvider -> com.android.tools.r8.internal.a21:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor get(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider -> com.android.tools.r8.internal.Y11:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider -> com.android.tools.r8.internal.b21:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor get(int,java.lang.String) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider -> com.android.tools.r8.internal.Z11:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider -> com.android.tools.r8.internal.c21:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor get(int,java.lang.String) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider -> com.android.tools.r8.internal.a21:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider -> com.android.tools.r8.internal.b21:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider -> com.android.tools.r8.internal.d21:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider -> com.android.tools.r8.internal.e21:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor get(int,java.lang.String,int,int) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider -> com.android.tools.r8.internal.c21:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider -> com.android.tools.r8.internal.f21:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor get(int,java.lang.String) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeParameterVisitorProvider -> com.android.tools.r8.internal.d21:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeParameterVisitorProvider -> com.android.tools.r8.internal.g21:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor get(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider -> com.android.tools.r8.internal.e21:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider -> com.android.tools.r8.internal.h21:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor get(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider -> com.android.tools.r8.internal.f21:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider -> com.android.tools.r8.internal.g21:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider -> com.android.tools.r8.internal.h21:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider -> com.android.tools.r8.internal.i21:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider -> com.android.tools.r8.internal.j21:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider -> com.android.tools.r8.internal.k21:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor get(int,java.lang.String) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmVersionRequirementVisitorProvider -> com.android.tools.r8.internal.i21:
-com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.internal.p21:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmVersionRequirementVisitorProvider -> com.android.tools.r8.internal.l21:
+com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.internal.s21:
     com.android.tools.r8.kotlin.Kotlin$Functional functional -> b
     com.android.tools.r8.kotlin.Kotlin$Metadata metadata -> d
     com.android.tools.r8.kotlin.Kotlin$_Assertions assertions -> e
@@ -109643,8 +109755,8 @@ com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.internal.p21:
     com.android.tools.r8.kotlin.Kotlin$Intrinsics intrinsics -> c
     com.android.tools.r8.graph.DexItemFactory factory -> a
     1:7:void <init>(com.android.tools.r8.graph.DexItemFactory):40:46 -> <init>
-com.android.tools.r8.kotlin.Kotlin$1 -> com.android.tools.r8.internal.k21:
-com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.internal.l21:
+com.android.tools.r8.kotlin.Kotlin$1 -> com.android.tools.r8.internal.n21:
+com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.internal.o21:
     com.android.tools.r8.graph.DexType lambdaType -> a
     com.android.tools.r8.kotlin.Kotlin this$0 -> b
     1:1:void <init>(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.kotlin.Kotlin$1):49:49 -> <init>
@@ -109654,7 +109766,7 @@ com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.internal.l
     13:26:void <init>(com.android.tools.r8.kotlin.Kotlin):64: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):67:67 -> a
-com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.internal.m21:
+com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.internal.p21:
     com.android.tools.r8.graph.DexMethod throwNpe -> c
     com.android.tools.r8.graph.DexMethod checkParameterIsNotNull -> b
     com.android.tools.r8.graph.DexMethod throwParameterIsNullException -> a
@@ -109662,7 +109774,7 @@ com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.internal.m
     5:8:void <init>(com.android.tools.r8.kotlin.Kotlin):112:115 -> <init>
     9:13:void <init>(com.android.tools.r8.kotlin.Kotlin):114:118 -> <init>
     14:14:void <init>(com.android.tools.r8.kotlin.Kotlin):117:117 -> <init>
-com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.internal.n21:
+com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.internal.q21:
     com.android.tools.r8.graph.DexString kind -> a
     com.android.tools.r8.graph.DexString metadataVersion -> b
     com.android.tools.r8.graph.DexString bytecodeVersion -> c
@@ -109672,11 +109784,11 @@ com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.internal.n21
     com.android.tools.r8.graph.DexString packageName -> g
     com.android.tools.r8.graph.DexString extraInt -> h
     1:9:void <init>(com.android.tools.r8.kotlin.Kotlin):91:99 -> <init>
-com.android.tools.r8.kotlin.Kotlin$_Assertions -> com.android.tools.r8.internal.o21:
+com.android.tools.r8.kotlin.Kotlin$_Assertions -> com.android.tools.r8.internal.r21:
     com.android.tools.r8.graph.DexField enabledField -> b
     com.android.tools.r8.graph.DexType type -> a
     1:5:void <init>(com.android.tools.r8.kotlin.Kotlin):102:106 -> <init>
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo -> com.android.tools.r8.internal.v21:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo -> com.android.tools.r8.internal.y21:
     java.util.Map EMPTY_ARGUMENTS -> a
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>():26:26 -> <init>
@@ -109685,7 +109797,7 @@ com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo -> com.android.tools.r8
     2:6:java.util.Map create(java.util.Map,com.android.tools.r8.graph.DexItemFactory):51:55 -> a
     7:7:void lambda$create$0(java.util.LinkedHashMap,com.android.tools.r8.graph.DexItemFactory,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):55:55 -> a
     1:10:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):36:45 -> b
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo -> com.android.tools.r8.internal.q21:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo -> com.android.tools.r8.internal.t21:
     com.android.tools.r8.kotlin.KotlinAnnotationInfo value -> b
     1:2:void <init>(com.android.tools.r8.kotlin.KotlinAnnotationInfo):129:130 -> <init>
     1:2:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue,com.android.tools.r8.graph.DexItemFactory):135:136 -> a
@@ -109693,7 +109805,7 @@ com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotat
     3:3:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):141:141 -> a
     4:4:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):147:147 -> a
     5:5:void lambda$rewrite$0(java.util.function.Consumer,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):150:150 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo -> com.android.tools.r8.internal.r21:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo -> com.android.tools.r8.internal.u21:
     java.util.List value -> b
     com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo EMPTY -> c
     1:2:void <clinit>():160:161 -> <clinit>
@@ -109703,7 +109815,7 @@ com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayVa
     9:10:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):182:183 -> a
     11:24:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):190:203 -> a
     25:25:void lambda$rewrite$0(java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):197:197 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo -> com.android.tools.r8.internal.s21:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo -> com.android.tools.r8.internal.v21:
     int arrayDimensionCount -> c
     com.android.tools.r8.kotlin.KotlinTypeReference value -> b
     1:3:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference,int):64:66 -> <init>
@@ -109712,7 +109824,7 @@ com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassVa
     4:4:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):77:77 -> a
     5:5:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):83:83 -> a
     6:6:void lambda$rewrite$0(java.util.function.Consumer,java.lang.String):84:84 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo -> com.android.tools.r8.internal.t21:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo -> com.android.tools.r8.internal.w21:
     java.lang.String enumEntryName -> c
     com.android.tools.r8.kotlin.KotlinTypeReference enumClassName -> b
     1:3:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference,java.lang.String):96:98 -> <init>
@@ -109723,14 +109835,14 @@ com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumVal
     7:7:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):110:110 -> a
     8:8:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):116:116 -> a
     9:9:void lambda$rewrite$0(java.util.function.Consumer,java.lang.String):118:118 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo -> com.android.tools.r8.internal.u21:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo -> com.android.tools.r8.internal.x21:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument argument -> b
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):212:213 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):217:217 -> a
     1:1:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo access$400(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):208 -> a
     2:2:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):228:228 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationInfo -> com.android.tools.r8.internal.w21:
+com.android.tools.r8.kotlin.KotlinAnnotationInfo -> com.android.tools.r8.internal.z21:
     java.util.Map arguments -> b
     java.util.List EMPTY_ANNOTATIONS -> c
     com.android.tools.r8.kotlin.KotlinTypeReference annotationType -> a
@@ -109751,7 +109863,7 @@ com.android.tools.r8.kotlin.KotlinAnnotationInfo -> com.android.tools.r8.interna
     71:71:void lambda$rewrite$0(java.util.Map,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):74:74 -> a
     72:73:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):89:90 -> a
     74:74:void lambda$trace$3(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.String,com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo):90:90 -> a
-com.android.tools.r8.kotlin.KotlinClassInfo -> com.android.tools.r8.internal.y21:
+com.android.tools.r8.kotlin.KotlinClassInfo -> com.android.tools.r8.internal.B21:
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> l
     com.android.tools.r8.kotlin.KotlinTypeInfo inlineClassUnderlyingType -> r
     java.lang.String packageName -> n
@@ -109773,7 +109885,7 @@ com.android.tools.r8.kotlin.KotlinClassInfo -> com.android.tools.r8.internal.y21
     java.util.List enumEntries -> k
     1:21:void <init>(int,java.lang.String,boolean,java.lang.String,com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo,java.util.List,java.util.List,java.util.List,java.util.List,java.util.List,java.util.List,com.android.tools.r8.kotlin.KotlinVersionRequirementInfo,com.android.tools.r8.kotlin.KotlinTypeReference,java.lang.String,com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo,int[],java.lang.String,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):80:100 -> <init>
     1:1:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):110:110 -> a
-    2:2:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():478:478 -> a
+    2:2:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():479:479 -> a
     2:2:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):111 -> a
     3:6:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):112:115 -> a
     7:11:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):114:118 -> a
@@ -109830,22 +109942,22 @@ com.android.tools.r8.kotlin.KotlinClassInfo -> com.android.tools.r8.internal.y21
     1:1:java.util.function.Consumer lambda$trace$6(com.android.tools.r8.kotlin.KotlinTypeReference):415:415 -> b
     1:1:java.lang.String getPackageName():400:400 -> j
     1:1:int[] getMetadataVersion():405:405 -> m
-com.android.tools.r8.kotlin.KotlinClassLevelInfo -> com.android.tools.r8.internal.z21:
+com.android.tools.r8.kotlin.KotlinClassLevelInfo -> com.android.tools.r8.internal.C21:
     boolean isNoKotlinInformation() -> a
     com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens) -> a
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo asSyntheticClass() -> f
     java.lang.String getPackageName() -> j
     boolean isSyntheticClass() -> l
     int[] getMetadataVersion() -> m
-com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.internal.E21:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.internal.H21:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():34:34 -> <clinit>
     1:3:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):51:53 -> a
-    4:4:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():478:478 -> a
+    4:4:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():479:479 -> a
     4:4:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):66 -> a
     5:11:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):66:72 -> a
     12:18:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):67:73 -> a
-    19:19:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():478:478 -> a
+    19:19:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():479:479 -> a
     19:19:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):56 -> a
     20:26:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):56:62 -> a
     27:33:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):57:63 -> a
@@ -109894,11 +110006,11 @@ com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.in
     2:2:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):214 -> c
     3:7:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):217:221 -> c
     8:8:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):215:215 -> c
-com.android.tools.r8.kotlin.KotlinClassMetadataReader$1 -> com.android.tools.r8.internal.C21:
-com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.internal.D21:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader$1 -> com.android.tools.r8.internal.F21:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.internal.G21:
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassMetadataReader$1):233:233 -> <init>
     2:2:void <init>(java.lang.String):235:235 -> <init>
-com.android.tools.r8.kotlin.KotlinClassifierInfo -> com.android.tools.r8.internal.L21:
+com.android.tools.r8.kotlin.KotlinClassifierInfo -> com.android.tools.r8.internal.O21:
     1:1:void <init>():24:24 -> <init>
     boolean rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens) -> a
     com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.GraphLens) -> a
@@ -109907,8 +110019,8 @@ com.android.tools.r8.kotlin.KotlinClassifierInfo -> com.android.tools.r8.interna
     24:25:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unknownClassifier(java.lang.String):53:54 -> a
     24:25:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48 -> a
     26:27:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48:49 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$1 -> com.android.tools.r8.internal.F21:
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinClassClassifierInfo -> com.android.tools.r8.internal.G21:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$1 -> com.android.tools.r8.internal.I21:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinClassClassifierInfo -> com.android.tools.r8.internal.J21:
     boolean isLocalOrAnonymous -> b
     com.android.tools.r8.kotlin.KotlinTypeReference type -> a
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference,boolean,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):59:59 -> <init>
@@ -109917,38 +110029,38 @@ com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinClassClassifierInfo -> co
     2:4:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,java.lang.String):73:73 -> a
     5:5:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):83:83 -> a
     6:6:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.GraphLens):88:88 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeAliasClassifierInfo -> com.android.tools.r8.internal.H21:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeAliasClassifierInfo -> com.android.tools.r8.internal.K21:
     java.lang.String typeAlias -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):112:112 -> <init>
     2:3:void <init>(java.lang.String):116:117 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:boolean rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):122:122 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeParameterClassifierInfo -> com.android.tools.r8.internal.I21:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeParameterClassifierInfo -> com.android.tools.r8.internal.L21:
     int typeId -> a
     1:1:void <init>(int,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):92:92 -> <init>
     2:3:void <init>(int):96:97 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:boolean rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):102:102 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassClassifierInfo -> com.android.tools.r8.internal.J21:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassClassifierInfo -> com.android.tools.r8.internal.M21:
     java.lang.String classifier -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):132:132 -> <init>
     2:3:void <init>(java.lang.String):135:136 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:boolean rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):141:141 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassifierInfo -> com.android.tools.r8.internal.K21:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassifierInfo -> com.android.tools.r8.internal.N21:
     java.lang.String classifier -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):151:151 -> <init>
     2:3:void <init>(java.lang.String):154:155 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:boolean rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):160:160 -> a
-com.android.tools.r8.kotlin.KotlinCompanionInfo -> com.android.tools.r8.internal.M21:
+com.android.tools.r8.kotlin.KotlinCompanionInfo -> com.android.tools.r8.internal.P21:
     java.lang.String companionObjectFieldName -> a
     1:2:void <init>(java.lang.String):18:19 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:4:boolean rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):33:36 -> a
     boolean isCompanion() -> d
     com.android.tools.r8.kotlin.KotlinCompanionInfo asCompanion() -> e
-com.android.tools.r8.kotlin.KotlinConstructorInfo -> com.android.tools.r8.internal.N21:
+com.android.tools.r8.kotlin.KotlinConstructorInfo -> com.android.tools.r8.internal.Q21:
     java.util.List valueParameters -> b
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> c
     com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo signature -> d
@@ -109968,7 +110080,7 @@ com.android.tools.r8.kotlin.KotlinConstructorInfo -> com.android.tools.r8.intern
     31:33:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):94:96 -> a
     boolean isConstructor() -> g
     com.android.tools.r8.kotlin.KotlinConstructorInfo asConstructor() -> h
-com.android.tools.r8.kotlin.KotlinContractInfo -> com.android.tools.r8.internal.O21:
+com.android.tools.r8.kotlin.KotlinContractInfo -> com.android.tools.r8.internal.R21:
     java.util.List effects -> a
     com.android.tools.r8.kotlin.KotlinContractInfo NO_EFFECT -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -109980,7 +110092,7 @@ com.android.tools.r8.kotlin.KotlinContractInfo -> com.android.tools.r8.internal.
     17:17:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectInfo):49:49 -> a
     18:18:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):49:49 -> a
     19:27:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmContractVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):56:64 -> a
-com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo -> com.android.tools.r8.internal.Q21:
+com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo -> com.android.tools.r8.internal.T21:
     java.util.List functionsWithNoBacking -> b
     java.util.List typeAliases -> a
     java.util.List propertiesWithNoBacking -> c
@@ -110010,7 +110122,7 @@ com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo -> com.android.tools.
     162:162:java.util.function.Consumer lambda$trace$3(com.android.tools.r8.kotlin.KotlinFunctionInfo):236:236 -> a
     1:1:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup lambda$rewrite$1(com.android.tools.r8.kotlin.KotlinPropertyInfo):203:203 -> b
     1:1:java.util.function.Consumer lambda$trace$4(com.android.tools.r8.kotlin.KotlinPropertyInfo):237:237 -> c
-com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup -> com.android.tools.r8.internal.P21:
+com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup -> com.android.tools.r8.internal.S21:
     com.android.tools.r8.graph.DexEncodedField backingField -> a
     com.android.tools.r8.graph.DexEncodedMethod getter -> c
     com.android.tools.r8.graph.DexEncodedMethod setter -> b
@@ -110023,7 +110135,7 @@ com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup -
     1:1:com.android.tools.r8.graph.DexEncodedMethod access$100(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):240:240 -> b
     2:3:void setSetter(com.android.tools.r8.graph.DexEncodedMethod):257:258 -> b
     1:1:com.android.tools.r8.graph.DexEncodedMethod access$200(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):240:240 -> c
-com.android.tools.r8.kotlin.KotlinEffectExpressionInfo -> com.android.tools.r8.internal.R21:
+com.android.tools.r8.kotlin.KotlinEffectExpressionInfo -> com.android.tools.r8.internal.U21:
     java.util.List orArguments -> f
     com.android.tools.r8.kotlin.KotlinTypeInfo isInstanceType -> d
     java.util.List andArguments -> e
@@ -110040,7 +110152,7 @@ com.android.tools.r8.kotlin.KotlinEffectExpressionInfo -> com.android.tools.r8.i
     26:26:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):84:84 -> a
     27:45:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectExpressionVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):90:108 -> a
     1:1:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):85:85 -> b
-com.android.tools.r8.kotlin.KotlinEffectInfo -> com.android.tools.r8.internal.S21:
+com.android.tools.r8.kotlin.KotlinEffectInfo -> com.android.tools.r8.internal.V21:
     com.android.tools.r8.kotlin.KotlinEffectExpressionInfo conclusion -> d
     java.util.List constructorArguments -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind invocationKind -> b
@@ -110049,8 +110161,8 @@ com.android.tools.r8.kotlin.KotlinEffectInfo -> com.android.tools.r8.internal.S2
     1:1:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):50:50 -> a
     2:3:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):50:51 -> a
     4:13:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):56:65 -> a
-com.android.tools.r8.kotlin.KotlinFieldLevelInfo -> com.android.tools.r8.internal.T21:
-com.android.tools.r8.kotlin.KotlinFileFacadeInfo -> com.android.tools.r8.internal.U21:
+com.android.tools.r8.kotlin.KotlinFieldLevelInfo -> com.android.tools.r8.internal.W21:
+com.android.tools.r8.kotlin.KotlinFileFacadeInfo -> com.android.tools.r8.internal.X21:
     int[] metadataVersion -> c
     com.android.tools.r8.kotlin.KotlinPackageInfo packageInfo -> a
     java.lang.String packageName -> b
@@ -110061,7 +110173,7 @@ com.android.tools.r8.kotlin.KotlinFileFacadeInfo -> com.android.tools.r8.interna
     14:14:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):82:82 -> a
     1:1:java.lang.String getPackageName():72:72 -> j
     1:1:int[] getMetadataVersion():77:77 -> m
-com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo -> com.android.tools.r8.internal.V21:
+com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo -> com.android.tools.r8.internal.Y21:
     java.lang.String typeFlexibilityId -> i
     com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo NO_FLEXIBLE_UPPER_BOUND -> j
     boolean $assertionsDisabled -> k
@@ -110072,7 +110184,7 @@ com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo -> com.android.tool
     16:20:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):69:73 -> a
     21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor lambda$rewrite$0(com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider,int):74:74 -> a
     22:25:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):79:82 -> a
-com.android.tools.r8.kotlin.KotlinFunctionInfo -> com.android.tools.r8.internal.W21:
+com.android.tools.r8.kotlin.KotlinFunctionInfo -> com.android.tools.r8.internal.Z21:
     com.android.tools.r8.kotlin.KotlinTypeReference lambdaClassOrigin -> h
     com.android.tools.r8.kotlin.KotlinTypeInfo receiverParameterType -> e
     java.util.List typeParameters -> f
@@ -110108,14 +110220,14 @@ com.android.tools.r8.kotlin.KotlinFunctionInfo -> com.android.tools.r8.internal.
     boolean isFunction() -> i
     1:1:java.lang.String getName():116:116 -> n
     1:1:boolean hasCrossInlineParameter():72:72 -> o
-com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo -> com.android.tools.r8.internal.X21:
+com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo -> com.android.tools.r8.internal.a31:
     java.lang.String name -> b
     com.android.tools.r8.kotlin.KotlinTypeReference type -> a
     1:3:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinTypeReference):26:28 -> <init>
     1:3:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.graph.DexItemFactory):36:38 -> a
     4:17:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):47:60 -> a
     18:18:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):66:66 -> a
-com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo -> com.android.tools.r8.internal.Y21:
+com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo -> com.android.tools.r8.internal.b31:
     java.util.List EMPTY_PARAMETERS_LIST -> e
     java.util.List parameters -> c
     boolean $assertionsDisabled -> f
@@ -110130,7 +110242,7 @@ com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo -> com.android.tools.r8
     46:51:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):128:133 -> a
     52:52:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeReference):133:133 -> a
     1:13:java.lang.String toString():111:123 -> toString
-com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation -> com.android.tools.r8.internal.b31:
+com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation -> com.android.tools.r8.internal.e31:
     java.util.Set noExtensionIndicesForFunctions -> a
     java.util.Set noExtensionIndicesForConstructors -> b
     com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation EMPTY -> c
@@ -110169,8 +110281,8 @@ com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation -> com.androi
     67:67:boolean hasJvmMethodSignatureExtensionForConstructor(int):121:121 -> a
     68:68:com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation$KotlinJvmSignatureExtensionInformationBuilder builder():125:125 -> a
     1:1:boolean hasJvmMethodSignatureExtensionForFunction(int):117:117 -> b
-com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation$1 -> com.android.tools.r8.internal.Z21:
-com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation$KotlinJvmSignatureExtensionInformationBuilder -> com.android.tools.r8.internal.a31:
+com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation$1 -> com.android.tools.r8.internal.c31:
+com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation$KotlinJvmSignatureExtensionInformationBuilder -> com.android.tools.r8.internal.d31:
     java.util.Set noExtensionIndicesForFunctions -> a
     java.util.Set noExtensionIndicesForConstructors -> b
     1:4:void <init>():132:135 -> <init>
@@ -110185,7 +110297,7 @@ com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation$KotlinJvmSign
     7:7:void visitConstructors(java.util.List):166:166 -> a
     8:9:void lambda$visitConstructors$0(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,int):169:170 -> a
     1:1:void visitFunctions(java.util.List):154:154 -> b
-com.android.tools.r8.kotlin.KotlinLambdaInfo -> com.android.tools.r8.internal.c31:
+com.android.tools.r8.kotlin.KotlinLambdaInfo -> com.android.tools.r8.internal.f31:
     boolean hasBacking -> b
     com.android.tools.r8.kotlin.KotlinFunctionInfo function -> a
     boolean $assertionsDisabled -> c
@@ -110198,7 +110310,7 @@ com.android.tools.r8.kotlin.KotlinLambdaInfo -> com.android.tools.r8.internal.c3
     38:44:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):80 -> a
     45:47:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):80:82 -> a
     48:48:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):87:87 -> a
-com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo -> com.android.tools.r8.internal.d31:
+com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo -> com.android.tools.r8.internal.g31:
     java.util.List propertyInfos -> a
     com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo EMPTY_DELEGATED_PROPERTIES -> b
     boolean $assertionsDisabled -> c
@@ -110209,7 +110321,7 @@ com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo -> com.android.tool
     17:17:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinPropertyInfo):52:52 -> a
     18:18:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):52:52 -> a
     19:20:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):58:59 -> a
-com.android.tools.r8.kotlin.KotlinMemberLevelInfo -> com.android.tools.r8.internal.e31:
+com.android.tools.r8.kotlin.KotlinMemberLevelInfo -> com.android.tools.r8.internal.h31:
     boolean isNoKotlinInformation() -> a
     com.android.tools.r8.kotlin.KotlinFunctionInfo asFunction() -> b
     boolean isProperty() -> c
@@ -110219,7 +110331,7 @@ com.android.tools.r8.kotlin.KotlinMemberLevelInfo -> com.android.tools.r8.intern
     com.android.tools.r8.kotlin.KotlinConstructorInfo asConstructor() -> h
     boolean isFunction() -> i
     com.android.tools.r8.kotlin.KotlinPropertyInfo asProperty() -> k
-com.android.tools.r8.kotlin.KotlinMetadataDiagnostic -> com.android.tools.r8.internal.f31:
+com.android.tools.r8.kotlin.KotlinMetadataDiagnostic -> com.android.tools.r8.internal.i31:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.Position position -> b
     java.lang.String message -> c
@@ -110231,7 +110343,7 @@ com.android.tools.r8.kotlin.KotlinMetadataDiagnostic -> com.android.tools.r8.int
     1:1:java.lang.String getDiagnosticMessage():38:38 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():28:28 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():33:33 -> getPosition
-com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension -> com.android.tools.r8.internal.i31:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension -> com.android.tools.r8.internal.l31:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set prunedTypes -> c
@@ -110277,8 +110389,8 @@ com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension -> com.android.tools
     133:133:void lambda$done$6(com.android.tools.r8.graph.ProgramMember):135 -> a
     134:134:void lambda$done$6(com.android.tools.r8.graph.ProgramMember):135:135 -> a
     1:2:boolean lambda$done$4(com.android.tools.r8.graph.DexAnnotation):119:120 -> b
-com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$1 -> com.android.tools.r8.internal.g31:
-com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier -> com.android.tools.r8.internal.h31:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$1 -> com.android.tools.r8.internal.j31:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier -> com.android.tools.r8.internal.k31:
     java.util.Set prunedTypes -> c
     com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier enqueuerDefinitionSupplier -> b
     com.android.tools.r8.graph.ProgramDefinition context -> a
@@ -110287,7 +110399,7 @@ com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefini
     2:5:void <init>(com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier,java.util.Set):148:151 -> <init>
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():167:167 -> a
     1:4:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):159:162 -> c
-com.android.tools.r8.kotlin.KotlinMetadataMembersTracker -> com.android.tools.r8.internal.j31:
+com.android.tools.r8.kotlin.KotlinMetadataMembersTracker -> com.android.tools.r8.internal.m31:
     java.util.Set references -> b
     boolean $assertionsDisabled -> c
     int count -> a
@@ -110304,7 +110416,7 @@ com.android.tools.r8.kotlin.KotlinMetadataMembersTracker -> com.android.tools.r8
     28:28:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
     28:28:boolean com.android.tools.r8.kotlin.KotlinMetadataMembersTracker.isKotlinJvmType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):63 -> a
     28:28:boolean lambda$isEqual$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):54 -> a
-com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.internal.m31:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.internal.p31:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.NamingLens lens -> b
@@ -110352,8 +110464,8 @@ com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.inter
     2:2:void runForR8(java.util.concurrent.ExecutorService):90 -> b
     3:15:void runForR8(java.util.concurrent.ExecutorService):91:103 -> b
     16:16:void runForR8(java.util.concurrent.ExecutorService):102:102 -> b
-com.android.tools.r8.kotlin.KotlinMetadataRewriter$1 -> com.android.tools.r8.internal.k31:
-com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo -> com.android.tools.r8.internal.l31:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter$1 -> com.android.tools.r8.internal.n31:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo -> com.android.tools.r8.internal.o31:
     boolean writeData2 -> e
     boolean writeExtraString -> f
     boolean writePackageName -> g
@@ -110366,7 +110478,7 @@ com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo -> com
     2:10:void <init>(boolean,boolean,boolean,boolean,boolean,boolean,boolean,boolean):57:65 -> <init>
     1:1:com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo.rewriteAll():69:69 -> a
     1:1:com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo access$100():39 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils -> com.android.tools.r8.internal.s31:
+com.android.tools.r8.kotlin.KotlinMetadataUtils -> com.android.tools.r8.internal.v31:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo NO_KOTLIN_INFO -> a
     com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo INVALID_KOTLIN_INFO -> b
     1:2:void <clinit>():35:36 -> <clinit>
@@ -110385,8 +110497,8 @@ com.android.tools.r8.kotlin.KotlinMetadataUtils -> com.android.tools.r8.internal
     46:46:java.lang.String getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):211:211 -> a
     47:49:java.lang.String getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):224:226 -> a
     1:1:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo getNoKotlinInfo():80:80 -> b
-com.android.tools.r8.kotlin.KotlinMetadataUtils$1 -> com.android.tools.r8.internal.n31:
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor -> com.android.tools.r8.internal.q31:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$1 -> com.android.tools.r8.internal.q31:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor -> com.android.tools.r8.internal.t31:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature fieldSignature -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getterSignature -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature setterSignature -> c
@@ -110401,17 +110513,17 @@ com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor -> com.andro
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getterSignature():141:141 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$300(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):102:102 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature setterSignature():145:145 -> c
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 -> com.android.tools.r8.internal.p31:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 -> com.android.tools.r8.internal.s31:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor this$0 -> b
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):111:111 -> <init>
     1:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):114:117 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1$1 -> com.android.tools.r8.internal.o31:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1$1 -> com.android.tools.r8.internal.r31:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 this$1 -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():117:117 -> <clinit>
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1):117:117 -> <init>
     1:6:void visit(int,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):124:129 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo -> com.android.tools.r8.internal.r31:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo -> com.android.tools.r8.internal.u31:
     java.lang.String name -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinMetadataUtils$1):38:38 -> <init>
     2:3:void <init>(java.lang.String):43:44 -> <init>
@@ -110421,7 +110533,7 @@ com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo -> com.android.tool
     1:1:java.lang.String getPackageName():60:60 -> j
     1:1:int[] getMetadataVersion():65:65 -> m
     1:1:java.lang.String toString():49:49 -> toString
-com.android.tools.r8.kotlin.KotlinMetadataWriter -> com.android.tools.r8.internal.t31:
+com.android.tools.r8.kotlin.KotlinMetadataWriter -> com.android.tools.r8.internal.w31:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():47:47 -> <clinit>
     1:1:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):0:0 -> a
@@ -110643,8 +110755,8 @@ com.android.tools.r8.kotlin.KotlinMetadataWriter -> com.android.tools.r8.interna
     149:156:void lambda$appendKmEffectExpression$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):936:943 -> e
     157:170:void lambda$appendKmEffectExpression$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):937:950 -> e
     171:199:void lambda$appendKmEffectExpression$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):944:972 -> e
-com.android.tools.r8.kotlin.KotlinMethodLevelInfo -> com.android.tools.r8.internal.u31:
-com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo -> com.android.tools.r8.internal.v31:
+com.android.tools.r8.kotlin.KotlinMethodLevelInfo -> com.android.tools.r8.internal.x31:
+com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo -> com.android.tools.r8.internal.y31:
     java.util.List partClassNames -> a
     int[] metadataVersion -> c
     java.lang.String packageName -> b
@@ -110681,7 +110793,7 @@ com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo -> com.android.tools.
     374:374:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):92:92 -> a
     1:1:java.lang.String getPackageName():82:82 -> j
     1:1:int[] getMetadataVersion():87:87 -> m
-com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo -> com.android.tools.r8.internal.w31:
+com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo -> com.android.tools.r8.internal.z31:
     int[] metadataVersion -> d
     java.lang.String facadeClassName -> a
     com.android.tools.r8.kotlin.KotlinPackageInfo packageInfo -> b
@@ -110696,7 +110808,7 @@ com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo -> com.android.tools.r8
     16:16:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):90:90 -> a
     1:1:java.lang.String getPackageName():80:80 -> j
     1:1:int[] getMetadataVersion():85:85 -> m
-com.android.tools.r8.kotlin.KotlinPackageInfo -> com.android.tools.r8.internal.x31:
+com.android.tools.r8.kotlin.KotlinPackageInfo -> com.android.tools.r8.internal.A31:
     com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo containerInfo -> b
     com.android.tools.r8.kotlin.KotlinMetadataMembersTracker originalMembersWithKotlinInfo -> d
     java.lang.String moduleName -> a
@@ -110714,7 +110826,7 @@ com.android.tools.r8.kotlin.KotlinPackageInfo -> com.android.tools.r8.internal.x
     16:16:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):60:60 -> a
     16:16:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):60 -> a
     17:17:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):65:65 -> a
-    18:18:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():478:478 -> a
+    18:18:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():479:479 -> a
     18:18:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):66 -> a
     19:19:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):61:61 -> a
     20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):16:16 -> a
@@ -110723,12 +110835,12 @@ com.android.tools.r8.kotlin.KotlinPackageInfo -> com.android.tools.r8.internal.x
     21:21:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):54:54 -> a
     21:21:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):71 -> a
     22:22:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):72:72 -> a
-    23:23:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():478:478 -> a
+    23:23:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():479:479 -> a
     23:23:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):73 -> a
     24:24:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):70:70 -> a
     25:42:boolean rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):78:95 -> a
     43:44:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):100:101 -> a
-com.android.tools.r8.kotlin.KotlinPropertyInfo -> com.android.tools.r8.internal.y31:
+com.android.tools.r8.kotlin.KotlinPropertyInfo -> com.android.tools.r8.internal.B31:
     com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo syntheticMethodForAnnotations -> n
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> i
     int jvmFlags -> j
@@ -110769,7 +110881,7 @@ com.android.tools.r8.kotlin.KotlinPropertyInfo -> com.android.tools.r8.internal.
     1:1:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo getFieldSignature():125:125 -> n
     1:1:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo getGetterSignature():129:129 -> o
     1:1:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo getSetterSignature():133:133 -> p
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.internal.D31:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.internal.G31:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():23:23 -> <clinit>
     1:17:java.lang.String parseStratumContents(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder):193:209 -> a
@@ -110807,8 +110919,8 @@ com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tool
     166:197:void lambda$parseStratumContents$2(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder,java.util.List):212 -> b
     198:205:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addDebugEntryToBuilder(java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder):288:295 -> b
     198:205:void lambda$parseStratumContents$2(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder,java.util.List):212 -> b
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1 -> com.android.tools.r8.internal.A31:
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.internal.B31:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1 -> com.android.tools.r8.internal.D31:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.internal.E31:
     java.io.BufferedReader reader -> a
     java.lang.String readLine -> b
     boolean $assertionsDisabled -> c
@@ -110824,23 +110936,23 @@ com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReade
     1:1:java.lang.String readNextLine():51:51 -> b
     2:3:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader readUntil(java.lang.String):71:72 -> b
     1:1:void close():119:119 -> close
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.internal.C31:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.internal.F31:
     1:1:void <init>(java.lang.String):36:36 -> <init>
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.internal.D31$a:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.internal.G31$a:
     com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source source -> a
     com.android.tools.r8.naming.Range range -> b
     1:3:void <init>(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source,com.android.tools.r8.naming.Range):355:357 -> <init>
     1:1:com.android.tools.r8.naming.Range getRange():365:365 -> a
     1:1:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source getSource():361:361 -> b
     1:10:java.lang.String toString():370:379 -> toString
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.internal.D31$b:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.internal.G31$b:
     com.android.tools.r8.utils.SegmentTree inlineePositions -> a
     com.android.tools.r8.utils.SegmentTree calleePositions -> b
     1:3:void <init>(com.android.tools.r8.utils.SegmentTree,com.android.tools.r8.utils.SegmentTree):304:306 -> <init>
     1:1:java.util.Map$Entry lookupCalleePosition(int):314:314 -> a
     2:2:int inlinePositionsCount():318:318 -> a
     1:1:java.util.Map$Entry lookupInlinedPosition(int):310:310 -> b
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.android.tools.r8.internal.D31$c:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.android.tools.r8.internal.G31$c:
     java.lang.String fileName -> a
     java.lang.String path -> b
     1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1):328:328 -> <init>
@@ -110848,11 +110960,11 @@ com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.andro
     1:1:java.lang.String getFileName():338:338 -> a
     1:1:java.lang.String getPath():342:342 -> b
     1:1:java.lang.String toString():347:347 -> toString
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder -> com.android.tools.r8.internal.E31:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder -> com.android.tools.r8.internal.H31:
     java.util.Map files -> b
     com.android.tools.r8.utils.SegmentTree segmentTree -> a
     1:4:void <init>():322:325 -> <init>
-com.android.tools.r8.kotlin.KotlinSyntheticClassInfo -> com.android.tools.r8.internal.F31:
+com.android.tools.r8.kotlin.KotlinSyntheticClassInfo -> com.android.tools.r8.internal.I31:
     com.android.tools.r8.kotlin.KotlinLambdaInfo lambda -> a
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour flavour -> d
     int[] metadataVersion -> c
@@ -110863,7 +110975,7 @@ com.android.tools.r8.kotlin.KotlinSyntheticClassInfo -> com.android.tools.r8.int
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda) -> a
     1:5:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):47:51 -> a
     6:11:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):50:55 -> a
-    12:12:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():478:478 -> a
+    12:12:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():479:479 -> a
     12:12:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):55 -> a
     13:16:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):54:57 -> a
     17:21:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):79:83 -> a
@@ -110877,7 +110989,7 @@ com.android.tools.r8.kotlin.KotlinSyntheticClassInfo -> com.android.tools.r8.int
     boolean isSyntheticClass() -> l
     1:1:int[] getMetadataVersion():103:103 -> m
     1:1:boolean isLambda():63:63 -> n
-com.android.tools.r8.kotlin.KotlinTypeAliasInfo -> com.android.tools.r8.internal.G31:
+com.android.tools.r8.kotlin.KotlinTypeAliasInfo -> com.android.tools.r8.internal.J31:
     java.util.List annotations -> f
     com.android.tools.r8.kotlin.KotlinTypeInfo expandedType -> d
     java.util.List typeParameters -> e
@@ -110893,7 +111005,7 @@ com.android.tools.r8.kotlin.KotlinTypeAliasInfo -> com.android.tools.r8.internal
     21:24:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):82:85 -> a
     25:25:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeParameterInfo):84:84 -> a
     26:26:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):85:85 -> a
-com.android.tools.r8.kotlin.KotlinTypeInfo -> com.android.tools.r8.internal.H31:
+com.android.tools.r8.kotlin.KotlinTypeInfo -> com.android.tools.r8.internal.K31:
     com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo flexibleTypeUpperBound -> g
     java.util.List annotations -> f
     com.android.tools.r8.kotlin.KotlinTypeInfo outerType -> d
@@ -110912,7 +111024,7 @@ com.android.tools.r8.kotlin.KotlinTypeInfo -> com.android.tools.r8.internal.H31:
     57:57:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeProjectionInfo):129:129 -> a
     58:58:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):131:131 -> a
     59:59:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.GraphLens):135:135 -> a
-com.android.tools.r8.kotlin.KotlinTypeParameterInfo -> com.android.tools.r8.internal.I31:
+com.android.tools.r8.kotlin.KotlinTypeParameterInfo -> com.android.tools.r8.internal.L31:
     java.util.List annotations -> f
     java.util.List originalUpperBounds -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> d
@@ -110943,7 +111055,7 @@ com.android.tools.r8.kotlin.KotlinTypeParameterInfo -> com.android.tools.r8.inte
     41:41:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeInfo):113:113 -> a
     42:43:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):113:114 -> a
     44:44:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):114:114 -> a
-com.android.tools.r8.kotlin.KotlinTypeProjectionInfo -> com.android.tools.r8.internal.J31:
+com.android.tools.r8.kotlin.KotlinTypeProjectionInfo -> com.android.tools.r8.internal.M31:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> a
     com.android.tools.r8.kotlin.KotlinTypeInfo typeInfo -> b
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.kotlin.KotlinTypeInfo):22:24 -> <init>
@@ -110953,7 +111065,7 @@ com.android.tools.r8.kotlin.KotlinTypeProjectionInfo -> com.android.tools.r8.int
     5:8:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):44:47 -> a
     9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor lambda$rewrite$0(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider,int):47:47 -> a
     10:11:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):53:54 -> a
-com.android.tools.r8.kotlin.KotlinTypeReference -> com.android.tools.r8.internal.K31:
+com.android.tools.r8.kotlin.KotlinTypeReference -> com.android.tools.r8.internal.N31:
     com.android.tools.r8.graph.DexType known -> a
     java.lang.String originalName -> b
     boolean $assertionsDisabled -> c
@@ -110987,7 +111099,7 @@ com.android.tools.r8.kotlin.KotlinTypeReference -> com.android.tools.r8.internal
     1:12:boolean toRenamedDescriptorOrDefault(java.util.function.Consumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,java.lang.String):76:87 -> b
     1:1:java.lang.String getOriginalName():46:46 -> n
     1:1:java.lang.String toString():143:143 -> toString
-com.android.tools.r8.kotlin.KotlinValueParameterInfo -> com.android.tools.r8.internal.L31:
+com.android.tools.r8.kotlin.KotlinValueParameterInfo -> com.android.tools.r8.internal.O31:
     com.android.tools.r8.kotlin.KotlinTypeInfo varargElementType -> d
     java.util.List EMPTY_VALUE_PARAMETERS -> e
     com.android.tools.r8.kotlin.KotlinTypeInfo type -> c
@@ -110999,14 +111111,14 @@ com.android.tools.r8.kotlin.KotlinValueParameterInfo -> com.android.tools.r8.int
     7:14:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):59:66 -> a
     15:19:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):73:77 -> a
     20:22:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):85:87 -> a
-com.android.tools.r8.kotlin.KotlinVersionRequirementInfo -> com.android.tools.r8.internal.N31:
+com.android.tools.r8.kotlin.KotlinVersionRequirementInfo -> com.android.tools.r8.internal.Q31:
     java.util.List versionRequirements -> a
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo NO_VERSION_REQUIREMENTS -> b
     1:2:void <clinit>():17:18 -> <clinit>
     1:2:void <init>(java.util.List):22:23 -> <init>
     1:8:com.android.tools.r8.kotlin.KotlinVersionRequirementInfo create(java.util.List):27:34 -> a
     9:13:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmVersionRequirementVisitorProvider):38:42 -> a
-com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint -> com.android.tools.r8.internal.M31:
+com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint -> com.android.tools.r8.internal.P31:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel level -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind kind -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion version -> e
@@ -111017,7 +111129,7 @@ com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequiremen
     1:5:com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint access$000(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement):47 -> a
     6:8:void com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint.rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):78:80 -> a
     6:8:void access$100(com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):47 -> a
-com.android.tools.r8.logging.Log -> com.android.tools.r8.internal.F51:
+com.android.tools.r8.logging.Log -> com.android.tools.r8.internal.I51:
     java.util.Set CLASS_FILTER -> b
     boolean ENABLED -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -111328,7 +111440,7 @@ com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName -> com.a
     1:8:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange firstRangeForLine(int):123:130 -> b
     1:7:boolean equals(java.lang.Object):188:194 -> equals
     1:1:int hashCode():199:199 -> hashCode
-com.android.tools.r8.naming.DictionaryReader -> com.android.tools.r8.internal.zM0:
+com.android.tools.r8.naming.DictionaryReader -> com.android.tools.r8.internal.CM0:
     java.nio.file.Path path -> b
     java.io.BufferedReader reader -> a
     boolean $assertionsDisabled -> c
@@ -111497,7 +111609,7 @@ com.android.tools.r8.naming.IdentifierMinifier -> com.android.tools.r8.naming.w:
     40:40:void replaceDexItemBasedConstStringInMethod(com.android.tools.r8.graph.DexEncodedMethod):163 -> b
     41:52:void replaceDexItemBasedConstStringInMethod(com.android.tools.r8.graph.DexEncodedMethod):164:175 -> b
     1:4:void run(java.util.concurrent.ExecutorService):47:50 -> c
-com.android.tools.r8.naming.IdentifierNameStringMarker -> com.android.tools.r8.internal.fS0:
+com.android.tools.r8.naming.IdentifierNameStringMarker -> com.android.tools.r8.internal.iS0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> b
     boolean $assertionsDisabled -> c
@@ -111546,7 +111658,7 @@ com.android.tools.r8.naming.IdentifierNameStringMarker -> com.android.tools.r8.i
     359:359:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):324:324 -> a
     360:360:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$3(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):322:322 -> a
     361:385:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):357:381 -> a
-com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.internal.iS0:
+com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.internal.lS0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():41:41 -> <clinit>
     boolean lambda$evaluateTypeArrayContentFromConstructionToUse$0(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
@@ -111768,7 +111880,7 @@ com.android.tools.r8.naming.InternalNamingState -> com.android.tools.r8.naming.B
     int incrementNameIndex() -> a
     int getDictionaryIndex() -> b
     int incrementDictionaryIndex() -> c
-com.android.tools.r8.naming.MapVersion -> com.android.tools.r8.internal.s61:
+com.android.tools.r8.naming.MapVersion -> com.android.tools.r8.internal.v61:
     com.android.tools.r8.naming.MapVersion[] $VALUES -> e
     java.lang.String name -> a
     com.android.tools.r8.naming.MapVersion MAP_VERSION_1_0 -> c
@@ -111874,7 +111986,7 @@ com.android.tools.r8.naming.MethodNameMinifier -> com.android.tools.r8.naming.H:
     2:2:com.android.tools.r8.naming.MethodNamingState access$200(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType):92:92 -> 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):92:92 -> a
     4:4:java.util.function.Function getNamingKeyTransform():168:168 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     5:5:java.util.function.Function getNamingKeyTransform():168 -> a
     6:7:java.util.function.Function getNamingKeyTransform():169:170 -> a
     8:8:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.lang.Iterable,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):191:191 -> a
@@ -111901,7 +112013,7 @@ com.android.tools.r8.naming.MethodNameMinifier -> com.android.tools.r8.naming.H:
     147:147:boolean lambda$renameNonReboundMethodReference$6(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):386:386 -> a
     1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):92:92 -> b
     2:3:java.util.function.Function getReservationKeyTransform():157:158 -> b
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> b
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> b
     4:4:java.util.function.Function getReservationKeyTransform():158 -> b
     5:8:java.util.function.Function getReservationKeyTransform():160:163 -> b
     9:9:java.lang.Object lambda$getReservationKeyTransform$0(com.android.tools.r8.graph.DexMethod):160:160 -> b
@@ -112211,7 +112323,7 @@ com.android.tools.r8.naming.ProguardMapMinifier -> com.android.tools.r8.naming.g
     51:51:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map):355:355 -> a
     51:51:void computeDefaultInterfaceMethodMethods():341 -> a
     51:51:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):130 -> a
-    52:52:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.isCompanionClassType(com.android.tools.r8.graph.DexType):168:168 -> a
+    52:52:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.isCompanionClassType(com.android.tools.r8.graph.DexType):166:166 -> a
     52:52:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map):355 -> a
     52:52:void computeDefaultInterfaceMethodMethods():341 -> a
     52:52:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):130 -> a
@@ -112442,7 +112554,7 @@ com.android.tools.r8.naming.ProguardMapReader$ParseException -> com.android.tool
     java.lang.String msg -> d
     1:5:void <init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String,boolean):585:589 -> <init>
     1:4:java.lang.String toString():594:597 -> toString
-com.android.tools.r8.naming.ProguardMapSupplier -> com.android.tools.r8.internal.Yf1:
+com.android.tools.r8.naming.ProguardMapSupplier -> com.android.tools.r8.internal.bg1:
     com.android.tools.r8.naming.ClassNameMapper classNameMapper -> a
     com.android.tools.r8.utils.InternalOptions options -> c
     com.android.tools.r8.utils.Reporter reporter -> d
@@ -112463,8 +112575,8 @@ com.android.tools.r8.naming.ProguardMapSupplier -> com.android.tools.r8.internal
     39:39:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():67 -> a
     40:40:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():68:68 -> a
     1:1:com.android.tools.r8.StringConsumer access$200(com.android.tools.r8.naming.ProguardMapSupplier):21:21 -> b
-com.android.tools.r8.naming.ProguardMapSupplier$1 -> com.android.tools.r8.internal.Tf1:
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker -> com.android.tools.r8.internal.Uf1:
+com.android.tools.r8.naming.ProguardMapSupplier$1 -> com.android.tools.r8.internal.Wf1:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker -> com.android.tools.r8.internal.Xf1:
     java.lang.StringBuilder contents -> b
     com.android.tools.r8.StringConsumer inner -> a
     boolean $assertionsDisabled -> c
@@ -112477,23 +112589,23 @@ com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker -> com.androi
     3:5:boolean com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker.validateProguardMapParses(java.lang.String):172:174 -> finished
     3:5:void finished(com.android.tools.r8.DiagnosticsHandler):167 -> finished
     6:6:void finished(com.android.tools.r8.DiagnosticsHandler):167:167 -> finished
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId -> com.android.tools.r8.internal.Vf1:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId -> com.android.tools.r8.internal.Yf1:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>(java.lang.String,com.android.tools.r8.naming.ProguardMapSupplier$1):34:34 -> <init>
     2:4:void <init>(java.lang.String):36:38 -> <init>
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder -> com.android.tools.r8.internal.Wf1:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder -> com.android.tools.r8.internal.Zf1:
     com.android.tools.r8.com.google.common.hash.Hasher hasher -> a
     1:3:void <init>():116:118 -> <init>
     1:4:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder.accept(java.lang.String):122:125 -> a
     1:4:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):116 -> a
     5:5:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId build():132:132 -> a
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter -> com.android.tools.r8.internal.Xf1:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter -> com.android.tools.r8.internal.ag1:
     com.android.tools.r8.naming.ProguardMapSupplier this$0 -> a
     1:1:void <init>(com.android.tools.r8.naming.ProguardMapSupplier):136:136 -> <init>
     1:1:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter.accept(java.lang.String):140:140 -> a
     1:1:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):136 -> a
-com.android.tools.r8.naming.Range -> com.android.tools.r8.internal.ii1:
+com.android.tools.r8.naming.Range -> com.android.tools.r8.internal.li1:
     int to -> b
     int from -> a
     1:3:void <init>(int,int):12:14 -> <init>
@@ -112585,7 +112697,7 @@ com.android.tools.r8.naming.SeedMapper$Builder -> com.android.tools.r8.naming.n0
     6:7:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):57:58 -> a
     6:7:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):39 -> a
     8:9:com.android.tools.r8.naming.SeedMapper build():65:66 -> a
-com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.internal.Hn1:
+com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.internal.zn1:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexApplication application -> b
     boolean $assertionsDisabled -> c
@@ -112594,12 +112706,12 @@ com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.internal.
     1:11:void run():33:43 -> a
     12:14:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.SourceFileRewriter.getSourceFileRenaming(com.android.tools.r8.shaking.ProguardConfiguration):86:88 -> a
     12:14:void run():46 -> a
-    15:15:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    15:15:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     15:15:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.SourceFileRewriter.getSourceFileRenaming(com.android.tools.r8.shaking.ProguardConfiguration):88 -> a
     15:15:void run():46 -> a
     16:34:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.SourceFileRewriter.getSourceFileRenaming(com.android.tools.r8.shaking.ProguardConfiguration):91:109 -> a
     16:34:void run():46 -> a
-    35:35:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    35:35:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     35:35:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.SourceFileRewriter.getSourceFileRenaming(com.android.tools.r8.shaking.ProguardConfiguration):109 -> a
     35:35:void run():46 -> a
     36:36:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.SourceFileRewriter.getSourceFileRenaming(com.android.tools.r8.shaking.ProguardConfiguration):109:109 -> a
@@ -112608,7 +112720,7 @@ com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.internal.
     48:66:void lambda$run$2(com.android.tools.r8.graph.DexEncodedMethod):59:77 -> a
     67:67:boolean lambda$run$0(com.android.tools.r8.graph.DexDebugEvent):74:74 -> a
     68:68:com.android.tools.r8.graph.DexDebugEvent[] lambda$run$1(int):75:75 -> a
-com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo -> com.android.tools.r8.internal.UG0:
+com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo -> com.android.tools.r8.internal.XG0:
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo TYPE_NAME_INSTANCE -> g
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo SIMPLE_NAME_INSTANCE -> f
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping mapping -> b
@@ -112649,7 +112761,7 @@ com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo -> com.a
     1:1:com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo none():139:139 -> e
     1:5:boolean equals(java.lang.Object):174:178 -> equals
     1:1:int hashCode():183:183 -> hashCode
-com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping -> com.android.tools.r8.internal.TG0:
+com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping -> com.android.tools.r8.internal.WG0:
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping NONE -> a
     boolean $assertionsDisabled -> g
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping NAME -> b
@@ -112666,7 +112778,7 @@ com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNam
     52:52:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):63:63 -> a
     53:53:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):54:54 -> a
     54:92:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):46:84 -> a
-com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo -> com.android.tools.r8.internal.VO0:
+com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo -> com.android.tools.r8.internal.YO0:
     com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo FIELD_NAME_INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -112674,7 +112786,7 @@ com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo -> com.a
     boolean needsToComputeName() -> c
     boolean needsToRegisterReference() -> d
     1:1:com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo forFieldName():21:21 -> e
-com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo -> com.android.tools.r8.internal.o91:
+com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo -> com.android.tools.r8.internal.r91:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo asClassNameComputationInfo() -> a
     1:2:com.android.tools.r8.graph.DexString computeNameFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):20:21 -> a
@@ -112690,22 +112802,22 @@ com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo -> com.androi
     com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo asFieldNameComputationInfo() -> b
     boolean needsToComputeName() -> c
     boolean needsToRegisterReference() -> d
-com.android.tools.r8.naming.identifiernamestring.ClassForNameIdentifierNameStringLookupResult -> com.android.tools.r8.internal.jG0:
+com.android.tools.r8.naming.identifiernamestring.ClassForNameIdentifierNameStringLookupResult -> com.android.tools.r8.internal.mG0:
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():610:610 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():616:616 -> a
     1:1:boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions):24 -> a
     boolean isTypeInitializedFromUse() -> d
-com.android.tools.r8.naming.identifiernamestring.ClassNameComparisonIdentifierNameStringLookupResult -> com.android.tools.r8.internal.SG0:
+com.android.tools.r8.naming.identifiernamestring.ClassNameComparisonIdentifierNameStringLookupResult -> com.android.tools.r8.internal.VG0:
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
     boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isTypeInitializedFromUse() -> d
-com.android.tools.r8.naming.identifiernamestring.DexMemberBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.oM0:
+com.android.tools.r8.naming.identifiernamestring.DexMemberBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.rM0:
     1:1:void <init>(com.android.tools.r8.graph.DexMember):13:13 -> <init>
-com.android.tools.r8.naming.identifiernamestring.DexTypeBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.uM0:
+com.android.tools.r8.naming.identifiernamestring.DexTypeBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.xM0:
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
     boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isTypeInitializedFromUse() -> d
-com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult -> com.android.tools.r8.internal.eS0:
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult -> com.android.tools.r8.internal.hS0:
     com.android.tools.r8.graph.DexReference reference -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():13:13 -> <clinit>
@@ -112733,15 +112845,15 @@ com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResul
     2:2:java.lang.Object com.android.tools.r8.utils.FunctionUtils.applyOrElse(java.lang.Object,java.util.function.Function,java.lang.Object):15:15 -> c
     2:2:com.android.tools.r8.naming.identifiernamestring.DexTypeBasedConstStringIdentifierNameStringLookupResult fromDexTypeBasedConstString(com.android.tools.r8.graph.DexType):33 -> c
     3:3:com.android.tools.r8.naming.identifiernamestring.DexTypeBasedConstStringIdentifierNameStringLookupResult fromDexTypeBasedConstString(com.android.tools.r8.graph.DexType):33:33 -> c
-com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringMemberLookupResult -> com.android.tools.r8.internal.gS0:
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringMemberLookupResult -> com.android.tools.r8.internal.jS0:
     1:1:void <init>(com.android.tools.r8.graph.DexMember):13:13 -> <init>
-com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringTypeLookupResult -> com.android.tools.r8.internal.hS0:
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringTypeLookupResult -> com.android.tools.r8.internal.kS0:
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
     com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringTypeLookupResult asTypeResult() -> a
     boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isTypeResult() -> c
     boolean isTypeInitializedFromUse() -> d
-com.android.tools.r8.naming.identifiernamestring.UncategorizedMemberIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Nr1:
+com.android.tools.r8.naming.identifiernamestring.UncategorizedMemberIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Fr1:
     1:1:void <init>(com.android.tools.r8.graph.DexMember):13:13 -> <init>
 com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation -> com.android.tools.r8.naming.mappinginformation.c:
     com.android.tools.r8.naming.MapVersion SUPPORTED_VERSION -> a
@@ -112772,7 +112884,7 @@ com.android.tools.r8.naming.mappinginformation.FileNameInformation -> com.androi
     15:15:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):74:74 -> a
     1:4:java.lang.String serialize():55:58 -> d
     1:1:java.lang.String getFileName():31:31 -> e
-com.android.tools.r8.naming.mappinginformation.MapVersionMappingInformation -> com.android.tools.r8.internal.t61:
+com.android.tools.r8.naming.mappinginformation.MapVersionMappingInformation -> com.android.tools.r8.internal.w61:
     com.android.tools.r8.naming.MapVersion mapVersion -> a
     1:2:void <init>(com.android.tools.r8.naming.MapVersion):23:24 -> <init>
     boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation) -> a
@@ -112821,20 +112933,20 @@ com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics ->
     1:1:com.android.tools.r8.origin.Origin getOrigin():21:21 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():26:26 -> getPosition
     1:1:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics notAllowedCombination(com.android.tools.r8.naming.mappinginformation.MappingInformation,com.android.tools.r8.naming.mappinginformation.MappingInformation,int):98:98 -> notAllowedCombination
-com.android.tools.r8.naming.signature.GenericSignatureAction -> com.android.tools.r8.internal.OQ0:
+com.android.tools.r8.naming.signature.GenericSignatureAction -> com.android.tools.r8.internal.RQ0:
     void parsedIdentifier(java.lang.String) -> a
     java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String) -> a
     void parsedSymbol(char) -> a
     java.lang.Object parsedTypeName(java.lang.String,com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition) -> a
     void stop() -> a
     void start() -> b
-com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition -> com.android.tools.r8.internal.OQ0$a:
+com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition -> com.android.tools.r8.internal.RQ0$a:
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition MEMBER_ANNOTATION -> c
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition ENCLOSING_INNER_OR_TYPE_ANNOTATION -> b
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition CLASS_SUPER_OR_INTERFACE_ANNOTATION -> a
     1:3:void <clinit>():15:17 -> <clinit>
     1:1:void <init>(java.lang.String,int):14:14 -> <init>
-com.android.tools.r8.naming.signature.GenericSignatureParser -> com.android.tools.r8.internal.QQ0:
+com.android.tools.r8.naming.signature.GenericSignatureParser -> com.android.tools.r8.internal.TQ0:
     com.android.tools.r8.naming.signature.GenericSignatureAction actions -> a
     char[] buffer -> e
     int pos -> f
@@ -112878,13 +112990,13 @@ com.android.tools.r8.naming.signature.GenericSignatureParser -> com.android.tool
     1:11:void updateOptTypeArguments():252:262 -> f
     1:13:void updateTypeArgument():268:280 -> g
     1:9:void updateTypeVariableSignature():286:294 -> h
-com.android.tools.r8.naming.signature.GenericSignatureRewriter -> com.android.tools.r8.internal.RQ0:
+com.android.tools.r8.naming.signature.GenericSignatureRewriter -> com.android.tools.r8.internal.UQ0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.NamingLens namingLens -> b
     com.android.tools.r8.graph.GenericSignatureContextBuilder contextBuilder -> c
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.GenericSignatureContextBuilder):35:38 -> <init>
     1:11:void run(java.lang.Iterable,java.util.concurrent.ExecutorService):45:55 -> a
-    12:12:boolean com.android.tools.r8.graph.AppView.hasLiveness():611:611 -> a
+    12:12:boolean com.android.tools.r8.graph.AppView.hasLiveness():616:616 -> a
     12:12:void run(java.lang.Iterable,java.util.concurrent.ExecutorService):55 -> a
     13:22:void run(java.lang.Iterable,java.util.concurrent.ExecutorService):55:64 -> a
     23:23:void run(java.lang.Iterable,java.util.concurrent.ExecutorService):61:61 -> a
@@ -112907,7 +113019,7 @@ com.android.tools.r8.naming.signature.GenericSignatureRewriter -> com.android.to
     73:76:void lambda$run$4(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):99:102 -> a
     77:77:void lambda$run$4(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):96:96 -> a
     78:78:void lambda$run$4(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):95:95 -> a
-com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.internal.dG0:
+com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.internal.gG0:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -112954,7 +113066,7 @@ com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.i
     109:109:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):219:219 -> a
     110:110:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94:94 -> a
     110:110:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):166 -> a
-com.android.tools.r8.optimize.FieldRebindingIdentityLens -> com.android.tools.r8.internal.aP0:
+com.android.tools.r8.optimize.FieldRebindingIdentityLens -> com.android.tools.r8.internal.dP0:
     boolean $assertionsDisabled -> g
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> f
     1:1:void <clinit>():23:23 -> <clinit>
@@ -112976,18 +113088,18 @@ com.android.tools.r8.optimize.FieldRebindingIdentityLens -> com.android.tools.r8
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> e
     com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
     1:1:boolean isContextFreeForMethods():111:111 -> f
-com.android.tools.r8.optimize.FieldRebindingIdentityLens$1 -> com.android.tools.r8.internal.YO0:
-com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder -> com.android.tools.r8.internal.ZO0:
+com.android.tools.r8.optimize.FieldRebindingIdentityLens$1 -> com.android.tools.r8.internal.bP0:
+com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder -> com.android.tools.r8.internal.cP0:
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> a
     1:1:void <init>(com.android.tools.r8.optimize.FieldRebindingIdentityLens$1):114:114 -> <init>
     2:2:void <init>():119:119 -> <init>
     3:3:void <init>():116:116 -> <init>
     1:1:void recordDefinitionForNonReboundFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):123:123 -> a
     2:3:com.android.tools.r8.optimize.FieldRebindingIdentityLens build(com.android.tools.r8.graph.DexItemFactory):130:131 -> a
-com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.internal.ZX0:
-    com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind kind -> c
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.graph.DexMethod target -> d
+com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.internal.cY0:
+    com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind kind -> d
+    boolean $assertionsDisabled -> f
+    com.android.tools.r8.graph.DexMethod target -> e
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory):17:17 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):13:13 -> <init>
@@ -112996,18 +113108,18 @@ com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r
     8:8:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):80 -> a
     9:9:void com.android.tools.r8.optimize.InvokeSingleTargetExtractor.invalid():32:32 -> a
     9:9:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):55 -> a
-    10:10:com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind getKind():40:40 -> a
     1:1:void com.android.tools.r8.optimize.InvokeSingleTargetExtractor.invalid():32:32 -> b
     1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):65 -> b
-    2:2:com.android.tools.r8.graph.DexMethod getTarget():36:36 -> b
     1:1:void com.android.tools.r8.optimize.InvokeSingleTargetExtractor.invalid():32:32 -> c
     1:1:void registerInitClass(com.android.tools.r8.graph.DexType):45 -> c
     2:2:void com.android.tools.r8.optimize.InvokeSingleTargetExtractor.invalid():32:32 -> c
     2:2:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):75 -> c
-    3:3:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):60:60 -> c
+    3:3:com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind getKind():40:40 -> c
+    4:4:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):60:60 -> c
     1:1:void com.android.tools.r8.optimize.InvokeSingleTargetExtractor.invalid():32:32 -> d
     1:1:void registerInstanceOf(com.android.tools.r8.graph.DexType):105 -> d
-    2:2:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):70:70 -> d
+    2:2:com.android.tools.r8.graph.DexMethod getTarget():36:36 -> d
+    3:3:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):70:70 -> d
     1:1:void com.android.tools.r8.optimize.InvokeSingleTargetExtractor.invalid():32:32 -> e
     1:1:void registerNewInstance(com.android.tools.r8.graph.DexType):85 -> e
     2:2:void com.android.tools.r8.optimize.InvokeSingleTargetExtractor.invalid():32:32 -> e
@@ -113017,7 +113129,7 @@ com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):95 -> g
     2:2:void com.android.tools.r8.optimize.InvokeSingleTargetExtractor.invalid():32:32 -> g
     2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):100 -> g
-com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.internal.Q61:
+com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.internal.T61:
     com.android.tools.r8.optimize.MemberRebindingLens$Builder lensBuilder -> d
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -113044,7 +113156,7 @@ com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.in
     132:147:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):181:196 -> a
     148:148:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):245:245 -> a
     148:148:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):203 -> a
-    149:149:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    149:149:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     149:149:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):245 -> a
     149:149:void lambda$computeMethodRebinding$3(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):203 -> a
     150:153:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):245:248 -> a
@@ -113076,9 +113188,9 @@ com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.in
     1:1:com.android.tools.r8.graph.DexEncodedMethod interfaceLookup(com.android.tools.r8.graph.DexMethod):140:140 -> c
     2:6:com.android.tools.r8.optimize.MemberRebindingLens run(java.util.concurrent.ExecutorService):362:366 -> c
     1:18:boolean verifyFieldAccessCollectionContainsAllNonReboundFieldReferences(java.util.concurrent.ExecutorService):371:388 -> d
-com.android.tools.r8.optimize.MemberRebindingAnalysis$1 -> com.android.tools.r8.internal.P61:
-    java.util.Set val$nonReboundFieldReferences -> c
-    com.android.tools.r8.optimize.MemberRebindingAnalysis this$0 -> d
+com.android.tools.r8.optimize.MemberRebindingAnalysis$1 -> com.android.tools.r8.internal.S61:
+    com.android.tools.r8.optimize.MemberRebindingAnalysis this$0 -> e
+    java.util.Set val$nonReboundFieldReferences -> d
     1:1:void <init>(com.android.tools.r8.optimize.MemberRebindingAnalysis,com.android.tools.r8.graph.DexItemFactory,java.util.Set):400:400 -> <init>
     void registerInvokeDirect(com.android.tools.r8.graph.DexMethod) -> a
     1:1:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):404:404 -> a
@@ -113094,7 +113206,7 @@ com.android.tools.r8.optimize.MemberRebindingAnalysis$1 -> com.android.tools.r8.
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> g
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):419:419 -> g
     1:5:void registerFieldReference(com.android.tools.r8.graph.DexField):423:427 -> i
-com.android.tools.r8.optimize.MemberRebindingIdentityLens -> com.android.tools.r8.internal.T61:
+com.android.tools.r8.optimize.MemberRebindingIdentityLens -> com.android.tools.r8.internal.W61:
     boolean $assertionsDisabled -> h
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> f
     java.util.Map nonReboundMethodReferenceToDefinitionMap -> g
@@ -113138,8 +113250,8 @@ com.android.tools.r8.optimize.MemberRebindingIdentityLens -> com.android.tools.r
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> e
     com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
     1:1:boolean isContextFreeForMethods():134:134 -> f
-com.android.tools.r8.optimize.MemberRebindingIdentityLens$1 -> com.android.tools.r8.internal.R61:
-com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder -> com.android.tools.r8.internal.S61:
+com.android.tools.r8.optimize.MemberRebindingIdentityLens$1 -> com.android.tools.r8.internal.U61:
+com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder -> com.android.tools.r8.internal.V61:
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map nonReboundMethodReferenceToDefinitionMap -> d
@@ -113159,7 +113271,7 @@ com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder -> com.android
     16:16:void com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder.recordNonReboundMethodAccess(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):201:201 -> a
     16:16:void recordMethodAccess(com.android.tools.r8.graph.DexMethod):214 -> a
     17:20:com.android.tools.r8.optimize.MemberRebindingIdentityLens build():224:227 -> a
-com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory -> com.android.tools.r8.internal.V61:
+com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory -> com.android.tools.r8.internal.Y61:
     1:19:com.android.tools.r8.optimize.MemberRebindingIdentityLens create(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):47:65 -> a
     20:20:com.android.tools.r8.optimize.MemberRebindingIdentityLens create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.MethodAccessInfoCollection):72:72 -> a
     21:21:com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder com.android.tools.r8.optimize.MemberRebindingIdentityLens.builder(com.android.tools.r8.graph.AppView):44:44 -> a
@@ -113171,16 +113283,16 @@ com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory -> com.android.
     26:29:void initializeMemberAccessInfoCollectionsForMemberRebinding(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder,java.util.concurrent.ExecutorService):88:91 -> a
     30:30:void initializeMemberAccessInfoCollectionsForMemberRebinding(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder,java.util.concurrent.ExecutorService):90:90 -> a
     31:31:void lambda$initializeMemberAccessInfoCollectionsForMemberRebinding$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder,java.util.Set,java.util.Set,com.android.tools.r8.graph.ProgramMethod):93:93 -> a
-    32:32:void com.android.tools.r8.graph.UseRegistry.accept(com.android.tools.r8.graph.ProgramMethod):23:23 -> a
+    32:32:void com.android.tools.r8.graph.UseRegistry.accept(com.android.tools.r8.graph.ProgramMethod):25:25 -> a
     32:32:void lambda$initializeMemberAccessInfoCollectionsForMemberRebinding$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder,java.util.Set,java.util.Set,com.android.tools.r8.graph.ProgramMethod):100 -> a
-com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory$NonReboundMemberReferencesRegistry -> com.android.tools.r8.internal.U61:
-    java.util.Set seenFieldReferences -> g
-    java.util.Set seenMethodReferences -> h
-    com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder methodAccessInfoCollectionBuilder -> f
-    com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> c
-    boolean $assertionsDisabled -> i
-    com.android.tools.r8.graph.FieldAccessInfoCollectionImpl fieldAccessInfoCollection -> e
-    com.android.tools.r8.graph.ProgramMethod context -> d
+com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory$NonReboundMemberReferencesRegistry -> com.android.tools.r8.internal.X61:
+    com.android.tools.r8.graph.ProgramMethod context -> e
+    java.util.Set seenFieldReferences -> h
+    java.util.Set seenMethodReferences -> i
+    com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder methodAccessInfoCollectionBuilder -> g
+    boolean $assertionsDisabled -> j
+    com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> d
+    com.android.tools.r8.graph.FieldAccessInfoCollectionImpl fieldAccessInfoCollection -> f
     1:1:void <clinit>():104:104 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder,java.util.Set,java.util.Set):120:126 -> <init>
     1:1:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):131:131 -> a
@@ -113207,7 +113319,7 @@ com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory$NonReboundMembe
     24:24:boolean com.android.tools.r8.graph.AbstractAccessContexts.isConcrete():0:0 -> i
     24:24:void registerFieldAccess(com.android.tools.r8.graph.DexField):171 -> i
     25:31:void registerFieldAccess(com.android.tools.r8.graph.DexField):171:177 -> i
-com.android.tools.r8.optimize.MemberRebindingLens -> com.android.tools.r8.internal.Y61:
+com.android.tools.r8.optimize.MemberRebindingLens -> com.android.tools.r8.internal.b71:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.AppView appView -> f
     java.util.Map methodMaps -> g
@@ -113241,8 +113353,8 @@ com.android.tools.r8.optimize.MemberRebindingLens -> com.android.tools.r8.intern
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> e
     com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
     1:1:boolean isContextFreeForMethods():94:94 -> f
-com.android.tools.r8.optimize.MemberRebindingLens$1 -> com.android.tools.r8.internal.W61:
-com.android.tools.r8.optimize.MemberRebindingLens$Builder -> com.android.tools.r8.internal.X61:
+com.android.tools.r8.optimize.MemberRebindingLens$1 -> com.android.tools.r8.internal.Z61:
+com.android.tools.r8.optimize.MemberRebindingLens$Builder -> com.android.tools.r8.internal.a71:
     java.util.Map methodMaps -> b
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -113257,7 +113369,7 @@ com.android.tools.r8.optimize.MemberRebindingLens$Builder -> com.android.tools.r
     11:11:void com.android.tools.r8.optimize.MemberRebindingLens$Builder.recordNonReboundFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):186:186 -> a
     11:11:void lambda$recordNonReboundFieldAccesses$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):181 -> a
     12:12:com.android.tools.r8.optimize.MemberRebindingLens build():190:190 -> a
-com.android.tools.r8.optimize.PublicizerLens -> com.android.tools.r8.internal.hi1:
+com.android.tools.r8.optimize.PublicizerLens -> com.android.tools.r8.internal.ki1:
     com.android.tools.r8.graph.AppView appView -> n
     boolean $assertionsDisabled -> p
     java.util.Set publicizedMethods -> o
@@ -113267,7 +113379,7 @@ com.android.tools.r8.optimize.PublicizerLens -> com.android.tools.r8.internal.hi
     1:2:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):42:43 -> a
     3:8:boolean com.android.tools.r8.optimize.PublicizerLens.publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):54:59 -> a
     3:8:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):43 -> a
-    9:9:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():485:485 -> a
+    9:9:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():427:427 -> a
     9:9:boolean com.android.tools.r8.optimize.PublicizerLens.publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):60 -> a
     9:9:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):43 -> a
     10:10:boolean com.android.tools.r8.optimize.PublicizerLens.publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):60:60 -> a
@@ -113276,15 +113388,15 @@ com.android.tools.r8.optimize.PublicizerLens -> com.android.tools.r8.internal.hi
     com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult) -> b
     boolean isLegitimateToHaveEmptyMappings() -> k
     1:1:com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder createBuilder():65:65 -> l
-com.android.tools.r8.optimize.PublicizerLens$1 -> com.android.tools.r8.internal.fi1:
-com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder -> com.android.tools.r8.internal.gi1:
+com.android.tools.r8.optimize.PublicizerLens$1 -> com.android.tools.r8.internal.ii1:
+com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder -> com.android.tools.r8.internal.ji1:
     java.util.Set publicizedMethods -> a
     1:1:void <init>(com.android.tools.r8.optimize.PublicizerLens$1):68:68 -> <init>
     2:2:void <init>():71:71 -> <init>
     3:3:void <init>():69:69 -> <init>
     1:4:com.android.tools.r8.graph.GraphLens build(com.android.tools.r8.graph.AppView):74:77 -> a
     5:5:void add(com.android.tools.r8.graph.DexMethod):81:81 -> a
-com.android.tools.r8.optimize.VisibilityBridgeRemover -> com.android.tools.r8.internal.wt1:
+com.android.tools.r8.optimize.VisibilityBridgeRemover -> com.android.tools.r8.internal.pt1:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -113330,29 +113442,35 @@ com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator -> com.andr
     51:51:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference.remove(com.android.tools.r8.graph.ProgramMethod):14 -> a
     51:51:void transferArgumentInformation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):118 -> a
     52:53:void transferArgumentInformation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):119:120 -> a
-    54:59:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):129:134 -> a
-    60:62:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator.populateParameterOptimizationInfo(com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):154:156 -> a
-    60:62:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):135 -> a
-    63:63:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():482:482 -> a
-    63:63:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator.populateParameterOptimizationInfo(com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):156 -> a
-    63:63:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):135 -> a
-    64:76:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator.populateParameterOptimizationInfo(com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):156:168 -> a
-    64:76:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):135 -> a
-    77:80:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):137:140 -> a
-    81:91:void optimizeMethodParameters(com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.concurrent.ExecutorService):177:187 -> a
-    92:92:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.builder(com.android.tools.r8.graph.AppView):23:23 -> a
-    92:92:void optimizeMethodParameters(com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.concurrent.ExecutorService):187 -> a
-    93:93:void optimizeMethodParameters(com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.concurrent.ExecutorService):188:188 -> a
-    94:95:void enqueueMethodsForProcessing(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder):201:202 -> a
-    96:97:void lambda$enqueueMethodsForProcessing$2(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod):206:207 -> a
-    98:98:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.isConcreteCallSiteOptimizationInfo():0:0 -> a
-    98:98:void lambda$enqueueMethodsForProcessing$2(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod):207 -> a
-    99:102:void lambda$enqueueMethodsForProcessing$2(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod):207:210 -> a
-    103:103:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():482:482 -> a
-    103:103:void lambda$enqueueMethodsForProcessing$2(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod):210 -> a
-    104:104:void lambda$enqueueMethodsForProcessing$2(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod):210:210 -> a
-    1:2:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder lambda$optimizeMethodParameters$1(com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Set):181:182 -> b
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner -> com.android.tools.r8.internal.vz0:
+    54:61:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):129:136 -> a
+    62:64:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator.populateParameterOptimizationInfo(com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):172:174 -> a
+    62:64:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):139 -> a
+    65:65:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():483:483 -> a
+    65:65:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator.populateParameterOptimizationInfo(com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):174 -> a
+    65:65:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):139 -> a
+    66:78:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator.populateParameterOptimizationInfo(com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):174:186 -> a
+    66:78:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):139 -> a
+    79:93:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):144:158 -> a
+    94:104:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens optimizeMethodParameters(java.util.List,java.util.function.Consumer,java.util.concurrent.ExecutorService):195:205 -> a
+    105:105:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.builder(com.android.tools.r8.graph.AppView):32:32 -> a
+    105:105:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens optimizeMethodParameters(java.util.List,java.util.function.Consumer,java.util.concurrent.ExecutorService):205 -> a
+    106:107:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens optimizeMethodParameters(java.util.List,java.util.function.Consumer,java.util.concurrent.ExecutorService):206:207 -> a
+    108:109:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder lambda$optimizeMethodParameters$1(java.util.function.Consumer,java.util.Set):199:200 -> a
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer -> com.android.tools.r8.internal.vz0:
+    com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens graphLens -> b
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens):32:34 -> <init>
+    1:9:void fixupApplication(java.util.Set,java.util.concurrent.ExecutorService):42:50 -> a
+    10:11:void fixupClass(com.android.tools.r8.graph.DexProgramClass):54:55 -> a
+    12:19:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupClass$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):57:64 -> a
+    20:22:void lambda$fixupClass$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod$Builder):68:70 -> a
+    23:30:void lambda$fixupClass$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):72:79 -> a
+    31:31:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isCheckNotNullClassification():0:0 -> a
+    31:31:void lambda$fixupClass$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):79 -> a
+    32:36:void lambda$fixupClass$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):80:84 -> a
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner -> com.android.tools.r8.internal.wz0:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference methodStates -> d
     java.util.Map virtualRootMethods -> c
     com.android.tools.r8.ir.code.AliasedValueConfiguration aliasedValueConfiguration -> e
@@ -113626,43 +113744,106 @@ com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner
     300:300:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.getVirtualRootMethod(com.android.tools.r8.graph.ProgramMethod):99:99 -> a
     300:300:com.android.tools.r8.graph.DexMethod getRepresentativeForPolymorphicInvokeOrElse(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):474 -> a
     301:301:com.android.tools.r8.graph.DexMethod getRepresentativeForPolymorphicInvokeOrElse(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):475:475 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer -> com.android.tools.r8.internal.yz0:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer -> com.android.tools.r8.internal.zz0:
     void acceptCodeScannerResult(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference) -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer andThen(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer):25:25 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer emptyConsumer():12:12 -> emptyConsumer
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer$1 -> com.android.tools.r8.internal.wz0:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer$1 -> com.android.tools.r8.internal.xz0:
     1:1:void <init>():12:12 -> <init>
     void acceptCodeScannerResult(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference) -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer$2 -> com.android.tools.r8.internal.xz0:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer$2 -> com.android.tools.r8.internal.yz0:
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer val$nextEventConsumer -> b
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer this$0 -> c
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer val$self -> a
     1:1:void <init>(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer):25:25 -> <init>
     1:2:void acceptCodeScannerResult(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):28:29 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens -> com.android.tools.r8.internal.Az0:
-    int $r8$clinit -> f
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder -> com.android.tools.r8.internal.zz0:
-    1:1:void <init>(com.android.tools.r8.graph.AppView):93:93 -> <init>
-    com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder mergeDisjoint(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder) -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorIROptimizer -> com.android.tools.r8.internal.Bz0:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens -> com.android.tools.r8.internal.Bz0:
+    boolean $assertionsDisabled -> o
+    java.util.Map removedParameters -> n
+    1:1:void <clinit>():19:19 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,java.util.Map):27:28 -> <init>
+    1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):53:53 -> a
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):43 -> a
+    2:5:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):45:48 -> a
+    1:1:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):53:53 -> f
+    1:1:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):58:58 -> g
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection getRemovedParameters(com.android.tools.r8.graph.DexMethod):36:36 -> h
+    2:2:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):53:53 -> h
+    2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection getRemovedParameters(com.android.tools.r8.graph.DexMethod):36 -> h
+    3:4:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection getRemovedParameters(com.android.tools.r8.graph.DexMethod):36:37 -> h
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder -> com.android.tools.r8.internal.Az0:
+    java.util.Map removedParameters -> c
+    com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newMethodSignatures -> b
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():61:61 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):69:69 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.AppView):64:70 -> <init>
+    1:1:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder.isEmpty():74:74 -> a
+    1:1:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens build():95 -> a
+    2:2:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens build():97:97 -> a
+    3:4:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder mergeDisjoint(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder):79:80 -> a
+    5:8:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):86:89 -> a
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorIROptimizer -> com.android.tools.r8.internal.Cz0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():26:26 -> <clinit>
-    1:42:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):39:80 -> a
-    43:43:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> a
-    43:43:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):81 -> a
-    44:44:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    44:44:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):84 -> a
-    45:60:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):85:100 -> a
-    61:61:com.android.tools.r8.ir.code.Assume com.android.tools.r8.ir.code.Assume.createAssumeDynamicTypeInstruction(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):62:62 -> a
-    61:61:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):102 -> a
-    62:74:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):104:116 -> a
-    75:75:com.android.tools.r8.ir.code.Assume com.android.tools.r8.ir.code.Assume.createAssumeNonNullInstruction(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):52:52 -> a
-    75:75:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):118 -> a
-    76:93:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):120:137 -> a
-    94:94:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    94:94:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):137 -> a
-    95:95:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):137:137 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator -> com.android.tools.r8.internal.Cz0:
+    1:25:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):39:63 -> a
+    26:26:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
+    26:26:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):65 -> a
+    27:41:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):66:80 -> a
+    42:42:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> a
+    42:42:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):81 -> a
+    43:43:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
+    43:43:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):84 -> a
+    44:59:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):85:100 -> a
+    60:60:com.android.tools.r8.ir.code.Assume com.android.tools.r8.ir.code.Assume.createAssumeDynamicTypeInstruction(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):62:62 -> a
+    60:60:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):102 -> a
+    61:73:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):104:116 -> a
+    74:74:com.android.tools.r8.ir.code.Assume com.android.tools.r8.ir.code.Assume.createAssumeNonNullInstruction(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):52:52 -> a
+    74:74:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):118 -> a
+    75:92:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):120:137 -> a
+    93:93:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    93:93:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):137 -> a
+    94:94:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):137:137 -> a
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorMethodReprocessingEnqueuer -> com.android.tools.r8.internal.Ez0:
+    com.android.tools.r8.graph.AppView appView -> a
+    1:2:void <init>(com.android.tools.r8.graph.AppView):35:36 -> <init>
+    1:5:void enqueueMethodForReprocessing(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):52:56 -> a
+    6:8:void enqueueMethodsWithNonTrivialOptimizationInfo(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder):62:64 -> a
+    9:10:void lambda$enqueueMethodsWithNonTrivialOptimizationInfo$0(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):68:69 -> a
+    11:11:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.isConcreteCallSiteOptimizationInfo():0:0 -> a
+    11:11:void lambda$enqueueMethodsWithNonTrivialOptimizationInfo$0(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):69 -> a
+    12:15:void lambda$enqueueMethodsWithNonTrivialOptimizationInfo$0(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):69:72 -> a
+    16:16:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():483:483 -> a
+    16:16:void lambda$enqueueMethodsWithNonTrivialOptimizationInfo$0(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):72 -> a
+    17:17:void lambda$enqueueMethodsWithNonTrivialOptimizationInfo$0(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):72:72 -> a
+    18:20:void enqueueAffectedCallers(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,java.util.concurrent.ExecutorService):86:88 -> a
+    21:38:void enqueueAffectedCallers(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,java.util.concurrent.ExecutorService):87:104 -> a
+    39:40:java.util.List lambda$enqueueAffectedCallers$2(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.graph.DexProgramClass):90:91 -> a
+    41:41:void lambda$enqueueAffectedCallers$1(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,java.util.List,com.android.tools.r8.graph.ProgramMethod):94:94 -> a
+    42:43:java.lang.Object com.android.tools.r8.graph.ProgramMethod.registerCodeReferencesWithResult(com.android.tools.r8.graph.UseRegistryWithResult):66:67 -> a
+    42:43:void lambda$enqueueAffectedCallers$1(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,java.util.List,com.android.tools.r8.graph.ProgramMethod):96 -> a
+    44:45:void lambda$enqueueAffectedCallers$1(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,java.util.List,com.android.tools.r8.graph.ProgramMethod):96:97 -> a
+    46:46:void lambda$enqueueAffectedCallers$3(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.GraphLens,java.util.List):106:106 -> a
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorMethodReprocessingEnqueuer$AffectedMethodUseRegistry -> com.android.tools.r8.internal.Dz0:
+    com.android.tools.r8.graph.AppView appView -> e
+    com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens graphLens -> f
+    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens):116:118 -> <init>
+    void registerInstanceFieldRead(com.android.tools.r8.graph.DexField) -> a
+    1:1:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):127:127 -> a
+    1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):132:132 -> b
+    void registerInitClass(com.android.tools.r8.graph.DexType) -> c
+    void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField) -> c
+    1:1:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):137:137 -> c
+    1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):142:142 -> d
+    void registerStaticFieldRead(com.android.tools.r8.graph.DexField) -> e
+    1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):147:147 -> e
+    1:10:void registerInvokeMethod(com.android.tools.r8.graph.DexMethod):151:160 -> f
+    11:11:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorMethodReprocessingEnqueuer$AffectedMethodUseRegistry.markAffected():122:122 -> f
+    11:11:void registerInvokeMethod(com.android.tools.r8.graph.DexMethod):161 -> f
+    void registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> g
+    void registerTypeReference(com.android.tools.r8.graph.DexType) -> g
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator -> com.android.tools.r8.internal.Fz0:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List stronglyConnectedProgramComponents -> e
     boolean $assertionsDisabled -> f
@@ -113676,13 +113857,13 @@ com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimization
     35:37:void setOptimizationInfo(java.util.concurrent.ExecutorService):129:129 -> a
     38:38:void setOptimizationInfo(com.android.tools.r8.graph.DexProgramClass):134:134 -> a
     39:52:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):138:151 -> a
-    53:53:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    53:53:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):1032 -> a
+    53:53:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    53:53:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):974 -> a
     53:53:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):151 -> a
-    54:54:com.android.tools.r8.graph.CfCode com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCfCode():1038:1038 -> a
-    54:54:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):1033 -> a
+    54:54:com.android.tools.r8.graph.CfCode com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCfCode():980:980 -> a
+    54:54:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):975 -> a
     54:54:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):151 -> a
-    55:55:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):1034:1034 -> a
+    55:55:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):976:976 -> a
     55:55:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):151 -> a
     56:66:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod):151:161 -> a
     67:67:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isPolymorphic():0:0 -> a
@@ -113697,17 +113878,92 @@ com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimization
     131:134:boolean lambda$setOptimizationInfo$1(com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.graph.ProgramMethod,int):188:191 -> a
     135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndMethod.getArgumentType(int):63:63 -> a
     135:135:boolean lambda$setOptimizationInfo$1(com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.graph.ProgramMethod,int):192 -> a
-    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getArgumentType(int):201:201 -> a
+    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getArgumentType(int):205:205 -> a
     136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndMethod.getArgumentType(int):63 -> a
     136:136:boolean lambda$setOptimizationInfo$1(com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.graph.ProgramMethod,int):192 -> a
     137:139:boolean lambda$setOptimizationInfo$1(com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.graph.ProgramMethod,int):193:193 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer -> com.android.tools.r8.internal.Dz0:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer -> com.android.tools.r8.internal.Gz0:
+    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
-    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):19:20 -> <init>
-    1:1:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder optimize(java.util.Set):35:35 -> a
-    2:2:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.builder(com.android.tools.r8.graph.AppView):23:23 -> a
-    2:2:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder optimize(java.util.Set):35 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods -> com.android.tools.r8.internal.Hz0:
+    java.util.Map removableVirtualMethodParameters -> d
+    com.android.tools.r8.utils.InternalOptions options -> c
+    boolean $assertionsDisabled -> g
+    java.util.Map newMethodSignatures -> e
+    java.util.Map occupiedMethodSignatures -> f
+    1:1:void <clinit>():38:38 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):58:58 -> <init>
+    2:17:void <init>(com.android.tools.r8.graph.AppView):46:61 -> <init>
+    boolean lambda$computeRemovableParametersFromMethod$7(int) -> a
+    1:12:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder optimize(java.util.Set,java.util.function.Consumer):76:87 -> a
+    13:13:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.builder(com.android.tools.r8.graph.AppView):32:32 -> a
+    13:13:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder optimize(java.util.Set,java.util.function.Consumer):87 -> a
+    14:16:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder optimize(java.util.Set,java.util.function.Consumer):88:90 -> a
+    17:18:void lambda$reservePinnedMethodSignatures$0(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.ProgramMethod):101:102 -> a
+    19:19:void lambda$reservePinnedMethodSignatures$1(com.android.tools.r8.graph.DexMethodSignature):107:107 -> a
+    20:26:void reserveMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):116:122 -> a
+    27:28:void computeRemovableVirtualMethodParameters(java.util.Set):130:131 -> a
+    29:29:void lambda$computeRemovableVirtualMethodParameters$3(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):135:135 -> a
+    30:30:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627:627 -> a
+    30:30:void lambda$computeRemovableVirtualMethodParameters$3(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):135 -> a
+    31:33:void lambda$computeRemovableVirtualMethodParameters$3(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):140:142 -> a
+    34:34:int com.android.tools.r8.graph.DexProto.getArity():91:91 -> a
+    34:34:void lambda$computeRemovableVirtualMethodParameters$3(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):142 -> a
+    35:50:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer.canRemoveParameterFromVirtualMethods(int,com.android.tools.r8.utils.collections.ProgramMethodSet):177:192 -> a
+    35:50:void lambda$computeRemovableVirtualMethodParameters$3(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):144 -> a
+    51:51:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.isConcreteCallSiteOptimizationInfo():0:0 -> a
+    51:51:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer.canRemoveParameterFromVirtualMethods(int,com.android.tools.r8.utils.collections.ProgramMethodSet):192 -> a
+    51:51:void lambda$computeRemovableVirtualMethodParameters$3(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):144 -> a
+    52:56:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer.canRemoveParameterFromVirtualMethods(int,com.android.tools.r8.utils.collections.ProgramMethodSet):194:198 -> a
+    52:56:void lambda$computeRemovableVirtualMethodParameters$3(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):144 -> a
+    57:63:void lambda$computeRemovableVirtualMethodParameters$3(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):145:151 -> a
+    64:65:void lambda$computeVirtualMethodsBySignature$4(java.util.Map,com.android.tools.r8.graph.ProgramMethod):164:165 -> a
+    66:80:boolean visitClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder):211:225 -> a
+    81:81:void lambda$visitClass$5(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramMethod):215:215 -> a
+    82:88:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer.computeRemovableParametersFromDirectMethod(com.android.tools.r8.graph.ProgramMethod):290:296 -> a
+    82:88:void lambda$visitClass$5(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramMethod):216 -> a
+    89:93:void lambda$visitClass$5(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramMethod):217:221 -> a
+    94:96:void lambda$visitClass$5(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramMethod):220:222 -> a
+    97:109:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):230:242 -> a
+    110:111:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):282:283 -> a
+    110:111:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):243 -> a
+    112:114:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):290:292 -> a
+    112:114:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):285 -> a
+    112:114:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):243 -> a
+    115:115:com.android.tools.r8.graph.DexType[] com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.rewriteParameters(com.android.tools.r8.graph.ProgramMethod):296:296 -> a
+    115:115:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):292 -> a
+    115:115:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):285 -> a
+    115:115:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):243 -> a
+    116:116:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):292:292 -> a
+    116:116:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):285 -> a
+    116:116:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):243 -> a
+    117:117:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection.rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):286:286 -> a
+    117:117:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):243 -> a
+    118:133:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):245:260 -> a
+    134:140:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):259:265 -> a
+    141:141:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> a
+    141:141:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):267 -> a
+    142:144:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):267:269 -> a
+    145:161:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):266:282 -> a
+    162:162:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):281:281 -> a
+    163:169:boolean lambda$getNewMethodSignature$6(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexMethod):271:277 -> a
+    170:170:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection computeRemovableParametersFromMethod(com.android.tools.r8.graph.ProgramMethod):327:327 -> a
+    171:191:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection computeRemovableParametersFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntPredicate):333:353 -> a
+    192:200:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection computeRemovableParametersFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntPredicate):348:356 -> a
+    1:3:java.util.Map computeVirtualMethodsBySignature(java.util.Set):159:161 -> b
+    4:4:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):274:274 -> b
+    4:4:java.util.Map computeVirtualMethodsBySignature(java.util.Set):161 -> b
+    5:7:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection computeRemovableParametersFromVirtualMethod(com.android.tools.r8.graph.ProgramMethod):300:302 -> b
+    8:22:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection computeRemovableParametersFromVirtualMethod(com.android.tools.r8.graph.ProgramMethod):301:315 -> b
+    23:34:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection computeRemovableParametersFromVirtualMethod(com.android.tools.r8.graph.ProgramMethod):311:322 -> b
+    1:10:void reservePinnedMethodSignatures(java.util.Set):97:106 -> c
+    11:11:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer.isParameterRemovalAllowed(com.android.tools.r8.graph.ProgramMethod):171:171 -> c
+    11:11:boolean lambda$computeRemovableVirtualMethodParameters$2(com.android.tools.r8.graph.ProgramMethod):135 -> c
+    12:12:boolean com.android.tools.r8.shaking.KeepInfo.isParameterRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):74:74 -> c
+    12:12:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer.isParameterRemovalAllowed(com.android.tools.r8.graph.ProgramMethod):171 -> c
+    12:12:boolean lambda$computeRemovableVirtualMethodParameters$2(com.android.tools.r8.graph.ProgramMethod):135 -> c
+    13:13:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer.isParameterRemovalAllowed(com.android.tools.r8.graph.ProgramMethod):172:172 -> c
+    13:13:boolean lambda$computeRemovableVirtualMethodParameters$2(com.android.tools.r8.graph.ProgramMethod):135 -> c
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods -> com.android.tools.r8.internal.Kz0:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference methodStates -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> d
@@ -113733,7 +113989,7 @@ com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizabl
     61:61:void lambda$forEachUnoptimizableMethod$1(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.utils.InternalOptions,java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):107 -> a
     62:62:void lambda$forEachUnoptimizableMethod$1(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.utils.InternalOptions,java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):108:108 -> a
     1:1:com.android.tools.r8.graph.ImmediateProgramSubtypingInfo access$100(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods):31:31 -> b
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods$UnoptimizableClassMethodPropagator -> com.android.tools.r8.internal.Fz0:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods$UnoptimizableClassMethodPropagator -> com.android.tools.r8.internal.Iz0:
     java.util.Map unoptimizableMethods -> f
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods this$0 -> g
     1:4:void <init>(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.utils.collections.ProgramMethodSet):206:209 -> <init>
@@ -113749,7 +114005,7 @@ com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizabl
     7:7:void visit(com.android.tools.r8.graph.DexProgramClass):231:231 -> l
     8:8:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):274:274 -> l
     8:8:void visit(com.android.tools.r8.graph.DexProgramClass):231 -> l
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods$UnoptimizableInterfaceMethodPropagator -> com.android.tools.r8.internal.Gz0:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods$UnoptimizableInterfaceMethodPropagator -> com.android.tools.r8.internal.Jz0:
     com.android.tools.r8.utils.collections.ProgramMethodSet unoptimizableClassRootMethods -> f
     java.util.Map unoptimizableInterfaceMethods -> g
     1:2:void <init>(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.utils.collections.ProgramMethodSet):125:126 -> <init>
@@ -113764,7 +114020,7 @@ com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizabl
     6:6:void com.android.tools.r8.graph.ImmediateProgramSubtypingInfo.forEachImmediateProgramSuperClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):68:68 -> l
     6:6:void visit(com.android.tools.r8.graph.DexProgramClass):143 -> l
     7:29:void visit(com.android.tools.r8.graph.DexProgramClass):151:173 -> l
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomArrayTypeParameterState -> com.android.tools.r8.internal.iC0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomArrayTypeParameterState -> com.android.tools.r8.internal.lC0:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomArrayTypeParameterState INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():13:15 -> <clinit>
@@ -113777,7 +114033,7 @@ com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomArrayTypePar
     9:9:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):41 -> a
     10:11:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):43:44 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomArrayTypeParameterState get():20:20 -> g
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomClassTypeParameterState -> com.android.tools.r8.internal.kC0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomClassTypeParameterState -> com.android.tools.r8.internal.nC0:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomClassTypeParameterState INSTANCE -> a
     1:3:void <clinit>():15:17 -> <clinit>
@@ -113790,7 +114046,7 @@ com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomClassTypePar
     12:12:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):46 -> a
     13:14:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):47:48 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomClassTypeParameterState get():22:22 -> g
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState -> com.android.tools.r8.internal.lC0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState -> com.android.tools.r8.internal.oC0:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -113802,11 +114058,11 @@ com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom asMonomorphicOrBottom() -> g
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom asPolymorphicOrBottom() -> i
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState get():20:20 -> k
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomParameterState -> com.android.tools.r8.internal.mC0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomParameterState -> com.android.tools.r8.internal.pC0:
     1:1:void <init>():13:13 -> <init>
     boolean isBottom() -> c
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableCopy() -> f
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomPrimitiveTypeParameterState -> com.android.tools.r8.internal.qC0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomPrimitiveTypeParameterState -> com.android.tools.r8.internal.tC0:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomPrimitiveTypeParameterState INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():12:14 -> <clinit>
@@ -113819,7 +114075,7 @@ com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomPrimitiveTyp
     6:6:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):37 -> a
     7:8:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):37:38 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomPrimitiveTypeParameterState get():20:20 -> g
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomReceiverParameterState -> com.android.tools.r8.internal.rC0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomReceiverParameterState -> com.android.tools.r8.internal.uC0:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomReceiverParameterState INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():13:15 -> <clinit>
@@ -113832,17 +114088,14 @@ com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomReceiverPara
     9:9:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):41 -> a
     10:11:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):43:44 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomReceiverParameterState get():20:20 -> g
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteArrayTypeParameterState -> com.android.tools.r8.internal.YI0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteArrayTypeParameterState -> com.android.tools.r8.internal.bJ0:
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():18:18 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set):32:35 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteArrayTypeParameterState.getNullability():70:70 -> a
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):52 -> a
-    2:3:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):52:53 -> a
-    4:4:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createNullValue():37:37 -> a
-    4:4:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):53 -> a
-    5:5:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):55:55 -> a
+    2:5:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):52:55 -> a
     6:6:com.android.tools.r8.ir.analysis.value.UnknownValue com.android.tools.r8.ir.analysis.value.AbstractValue.unknown():19:19 -> a
     6:6:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):55 -> a
     7:8:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):102:103 -> a
@@ -113867,18 +114120,25 @@ com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteArrayTypeP
     1:1:com.android.tools.r8.ir.analysis.type.Nullability getNullability():70:70 -> r
     1:1:boolean isEffectivelyBottom():84:84 -> s
     1:1:boolean isEffectivelyUnknown():88:88 -> t
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeParameterState -> com.android.tools.r8.internal.aJ0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeParameterState -> com.android.tools.r8.internal.dJ0:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> d
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractValue -> c
     1:1:void <clinit>():19:19 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType,java.util.Set):34:38 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):60:60 -> a
-    2:9:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):107:114 -> a
-    10:20:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):112:122 -> a
-    21:21:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
-    21:21:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):123 -> a
-    22:29:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):125:132 -> a
+    1:1:com.android.tools.r8.ir.analysis.type.DynamicType com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeParameterState.getDynamicType():65:65 -> a
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):56 -> a
+    2:2:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.DynamicType.getNullability():111:111 -> a
+    2:2:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):56 -> a
+    3:4:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):56:57 -> a
+    5:5:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNull():41:41 -> a
+    5:5:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):57 -> a
+    6:9:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):57:60 -> a
+    10:17:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):107:114 -> a
+    18:28:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):112:122 -> a
+    29:29:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
+    29:29:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):123 -> a
+    30:37:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):125:132 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableCopy():98:98 -> f
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeParameterState asClassParameter() -> h
     1:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState clearInParameters():43:44 -> k
@@ -113897,7 +114157,7 @@ com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeP
     2:2:boolean isEffectivelyBottom():89 -> s
     3:3:boolean isEffectivelyBottom():89:89 -> s
     1:1:boolean isEffectivelyUnknown():93:93 -> t
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMethodState -> com.android.tools.r8.internal.bJ0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMethodState -> com.android.tools.r8.internal.eJ0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -113930,7 +114190,7 @@ com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMethodStat
     20:20:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,java.util.function.Function):43:43 -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMethodState asConcrete() -> e
     boolean isConcrete() -> f
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState -> com.android.tools.r8.internal.cJ0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState -> com.android.tools.r8.internal.fJ0:
     java.util.List parameterStates -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():16:16 -> <clinit>
@@ -114008,10 +114268,10 @@ com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphi
     4:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState mutableCopy():40 -> l
     5:8:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState mutableCopy():40:43 -> l
     1:1:int size():105:105 -> m
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom -> com.android.tools.r8.internal.dJ0:
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown -> com.android.tools.r8.internal.eJ0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom -> com.android.tools.r8.internal.gJ0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown -> com.android.tools.r8.internal.hJ0:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableCopy() -> a
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState -> com.android.tools.r8.internal.gJ0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState -> com.android.tools.r8.internal.jJ0:
     java.util.Set inParameters -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():15:15 -> <clinit>
@@ -114035,7 +114295,7 @@ com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterS
     1:1:boolean hasInParameters():45:45 -> n
     1:1:void internalClearInParameters():33:33 -> o
     boolean isReferenceParameter() -> p
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState -> com.android.tools.r8.internal.hJ0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState -> com.android.tools.r8.internal.kJ0:
     java.util.Map receiverBoundsToState -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():18:18 -> <clinit>
@@ -114134,9 +114394,9 @@ com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphi
     4:4:boolean isEffectivelyUnknown():105 -> l
     5:5:boolean isEffectivelyUnknown():105:105 -> l
     1:1:java.util.Collection values():168:168 -> m
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom -> com.android.tools.r8.internal.iJ0:
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown -> com.android.tools.r8.internal.jJ0:
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeParameterState -> com.android.tools.r8.internal.kJ0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom -> com.android.tools.r8.internal.lJ0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown -> com.android.tools.r8.internal.mJ0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeParameterState -> com.android.tools.r8.internal.nJ0:
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractValue -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():16:16 -> <clinit>
@@ -114168,7 +114428,7 @@ com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveT
     2:2:boolean isEffectivelyBottom():92 -> q
     3:3:boolean isEffectivelyBottom():92:92 -> q
     1:1:boolean isEffectivelyUnknown():96:96 -> r
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReceiverParameterState -> com.android.tools.r8.internal.lJ0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReceiverParameterState -> com.android.tools.r8.internal.oJ0:
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():17:17 -> <clinit>
@@ -114194,14 +114454,14 @@ com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReceiverPa
     2:2:com.android.tools.r8.ir.analysis.type.Nullability getNullability():57:57 -> r
     1:1:boolean isEffectivelyBottom():66:66 -> s
     1:1:boolean isEffectivelyUnknown():70:70 -> t
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState -> com.android.tools.r8.internal.mJ0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState -> com.android.tools.r8.internal.pJ0:
     1:1:void <init>(java.util.Set):18:18 -> <init>
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action) -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState asReferenceParameter() -> j
     boolean isReferenceParameter() -> p
     com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType() -> q
     com.android.tools.r8.ir.analysis.type.Nullability getNullability() -> r
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter -> com.android.tools.r8.internal.K71:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter -> com.android.tools.r8.internal.N71:
     int index -> b
     com.android.tools.r8.graph.DexMethod method -> a
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,int):15:17 -> <init>
@@ -114209,7 +114469,7 @@ com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter ->
     1:1:com.android.tools.r8.graph.DexMethod getMethod():21:21 -> b
     1:5:boolean equals(java.lang.Object):30:34 -> equals
     1:1:int hashCode():39:39 -> hashCode
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState -> com.android.tools.r8.internal.Q71:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState -> com.android.tools.r8.internal.T71:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy() -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState) -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,java.util.function.Function) -> a
@@ -114222,7 +114482,7 @@ com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState -> com
     boolean isMonomorphic() -> h
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom asPolymorphicOrBottom() -> i
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState asPolymorphic() -> j
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase -> com.android.tools.r8.internal.R71:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase -> com.android.tools.r8.internal.U71:
     1:1:void <init>():7:7 -> <init>
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState asMonomorphic() -> b
     boolean isPolymorphic() -> c
@@ -114285,10 +114545,10 @@ com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollect
     3:3:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState get(com.android.tools.r8.graph.ProgramMethod):13 -> b
     4:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.get(com.android.tools.r8.graph.ProgramMethod):94:94 -> b
     4:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState get(com.android.tools.r8.graph.ProgramMethod):13 -> b
-com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyParameterState -> com.android.tools.r8.internal.na1:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyParameterState -> com.android.tools.r8.internal.qa1:
     1:1:void <init>():7:7 -> <init>
     com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyParameterState asNonEmpty() -> b
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState -> com.android.tools.r8.internal.he1:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState -> com.android.tools.r8.internal.ke1:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState asConcrete() -> a
     com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView) -> a
@@ -114298,7 +114558,7 @@ com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState ->
     boolean isConcrete() -> d
     boolean isUnknown() -> e
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableCopy() -> f
-com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState -> com.android.tools.r8.internal.Yr1:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState -> com.android.tools.r8.internal.Qr1:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -114307,14 +114567,14 @@ com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState) -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,java.util.function.Function) -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState get():21:21 -> k
-com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState -> com.android.tools.r8.internal.Zr1:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState -> com.android.tools.r8.internal.Rr1:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action) -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableCopy() -> f
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState get():20:20 -> g
-com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis -> com.android.tools.r8.internal.tt1:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis -> com.android.tools.r8.internal.mt1:
     java.util.Set monomorphicVirtualMethods -> g
     java.util.Map virtualRootMethodsPerClass -> f
     java.util.Map virtualRootMethods -> h
@@ -114337,7 +114597,7 @@ com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethods
     4:4:java.util.Map computeVirtualRootMethodsState(com.android.tools.r8.graph.DexProgramClass):99:99 -> m
     5:5:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):274:274 -> m
     5:5:java.util.Map computeVirtualRootMethodsState(com.android.tools.r8.graph.DexProgramClass):99 -> m
-com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis$VirtualRootMethod -> com.android.tools.r8.internal.st1:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis$VirtualRootMethod -> com.android.tools.r8.internal.lt1:
     com.android.tools.r8.utils.collections.ProgramMethodSet overrides -> b
     com.android.tools.r8.graph.ProgramMethod root -> a
     boolean $assertionsDisabled -> c
@@ -114348,7 +114608,7 @@ com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethods
     4:4:com.android.tools.r8.graph.ProgramMethod getRoot():45:45 -> a
     5:6:void forEach(java.util.function.Consumer):49:50 -> a
     1:1:boolean hasOverrides():54:54 -> b
-com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator -> com.android.tools.r8.internal.mT0:
+com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator -> com.android.tools.r8.internal.pT0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference methodStates -> b
     boolean $assertionsDisabled -> c
@@ -114374,7 +114634,7 @@ com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPro
     37:37:void postProcessMethodState(com.android.tools.r8.graph.ProgramMethod):132 -> a
     38:38:void postProcessMethodState(com.android.tools.r8.graph.ProgramMethod):132:132 -> a
     1:38:void run(java.util.concurrent.ExecutorService):53:90 -> b
-com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$FlowGraph -> com.android.tools.r8.internal.kT0:
+com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$FlowGraph -> com.android.tools.r8.internal.nT0:
     java.util.Map nodes -> a
     com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator this$0 -> b
     boolean $assertionsDisabled -> c
@@ -114432,11 +114692,11 @@ com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPro
     78:78:com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode lambda$getOrCreateParameterNode$1(com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,int,com.android.tools.r8.graph.ProgramMethod,java.lang.Integer,com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode):231:231 -> a
     79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndMethod.getArgumentType(int):63:63 -> a
     79:79:com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode lambda$getOrCreateParameterNode$1(com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,int,com.android.tools.r8.graph.ProgramMethod,java.lang.Integer,com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode):232 -> a
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getArgumentType(int):201:201 -> a
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getArgumentType(int):205:205 -> a
     80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndMethod.getArgumentType(int):63 -> a
     80:80:com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode lambda$getOrCreateParameterNode$1(com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,int,com.android.tools.r8.graph.ProgramMethod,java.lang.Integer,com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode):232 -> a
     81:81:com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode lambda$getOrCreateParameterNode$1(com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,int,com.android.tools.r8.graph.ProgramMethod,java.lang.Integer,com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode):232:232 -> a
-com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode -> com.android.tools.r8.internal.lT0:
+com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode -> com.android.tools.r8.internal.oT0:
     java.util.Set predecessors -> d
     java.util.Set successors -> e
     com.android.tools.r8.graph.DexType parameterType -> c
@@ -114460,7 +114720,7 @@ com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPro
     2:2:void setPending():312 -> f
     3:4:void setPending():312:313 -> f
     1:2:void unsetPending():321:322 -> g
-com.android.tools.r8.optimize.argumentpropagation.propagation.InterfaceMethodArgumentPropagator -> com.android.tools.r8.internal.fX0:
+com.android.tools.r8.optimize.argumentpropagation.propagation.InterfaceMethodArgumentPropagator -> com.android.tools.r8.internal.iX0:
     boolean $assertionsDisabled -> h
     java.util.Map methodStatesToPropagate -> g
     1:1:void <clinit>():39:39 -> <clinit>
@@ -114500,10 +114760,10 @@ com.android.tools.r8.optimize.argumentpropagation.propagation.InterfaceMethodArg
     5:5:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature computeInterfaceState(com.android.tools.r8.graph.DexProgramClass):99 -> m
     6:6:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature computeInterfaceState(com.android.tools.r8.graph.DexProgramClass):114:114 -> m
     1:1:boolean lambda$propagateInterfaceStateToClassHierarchy$2(com.android.tools.r8.graph.DexProgramClass):124:124 -> n
-com.android.tools.r8.optimize.argumentpropagation.propagation.MethodArgumentPropagator -> com.android.tools.r8.internal.u71:
+com.android.tools.r8.optimize.argumentpropagation.propagation.MethodArgumentPropagator -> com.android.tools.r8.internal.x71:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference methodStates -> f
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):21:22 -> <init>
-com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator -> com.android.tools.r8.internal.nt1:
+com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator -> com.android.tools.r8.internal.gt1:
     boolean $assertionsDisabled -> h
     java.util.Map propagationStates -> g
     1:1:void <clinit>():33:33 -> <clinit>
@@ -114576,7 +114836,7 @@ com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMet
     5:5:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):274:274 -> m
     5:5:void computePropagationState(com.android.tools.r8.graph.DexProgramClass):186 -> m
     6:6:void computePropagationState(com.android.tools.r8.graph.DexProgramClass):246:246 -> m
-com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState -> com.android.tools.r8.internal.mt1:
+com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState -> com.android.tools.r8.internal.ft1:
     java.util.Map activeUntilLowerBound -> b
     java.util.Map inactiveUntilUpperBound -> c
     com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator this$0 -> d
@@ -114609,7 +114869,7 @@ com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.AlwaysTru
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():21:21 -> <init>
     boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState,com.android.tools.r8.graph.DexType) -> a
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentPropagatorReprocessingCriteriaCollection -> com.android.tools.r8.internal.Ez0:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentPropagatorReprocessingCriteriaCollection -> com.android.tools.r8.internal.Hz0:
     java.util.Map reproccessingCriteria -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):40:40 -> <init>
@@ -114633,7 +114893,7 @@ com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentP
     97:97:void analyzeArgumentUses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):64:64 -> a
     98:110:void analyzeArgumentUses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):61:73 -> a
     111:111:void analyzeArgumentUses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):72:72 -> a
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria -> com.android.tools.r8.internal.O71:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria -> com.android.tools.r8.internal.R71:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap reproccesingCriteria -> a
     com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria EMPTY -> b
     boolean $assertionsDisabled -> c
@@ -114647,7 +114907,7 @@ com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodRep
     6:8:boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):53 -> a
     9:11:boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):54:56 -> a
     12:12:boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):55:55 -> a
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.NonTrivialParameterReprocessingCriteria -> com.android.tools.r8.internal.va1:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.NonTrivialParameterReprocessingCriteria -> com.android.tools.r8.internal.ya1:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():25:25 -> <clinit>
     1:2:void <init>(boolean):27:28 -> <init>
@@ -114666,10 +114926,10 @@ com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.NonTrivia
     8:8:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState.isPrimitiveParameter():0:0 -> a
     8:8:boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState,com.android.tools.r8.graph.DexType):39 -> a
     9:10:boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState,com.android.tools.r8.graph.DexType):39:40 -> a
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria -> com.android.tools.r8.internal.ge1:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria -> com.android.tools.r8.internal.je1:
     1:1:void <init>():12:12 -> <init>
     boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState,com.android.tools.r8.graph.DexType) -> a
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria$Builder -> com.android.tools.r8.internal.fe1:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria$Builder -> com.android.tools.r8.internal.ie1:
     boolean reprocessDueToAbstractValue -> a
     boolean reprocessDueToDynamicType -> b
     boolean reprocessDueToNullability -> c
@@ -114684,7 +114944,7 @@ com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.Parameter
     1:1:com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria$Builder setReprocessDueToDynamicType():57:57 -> c
     1:1:com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria$Builder setReprocessDueToNullability():62:62 -> d
     1:1:boolean shouldAlwaysReprocess():67:67 -> e
-com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal -> com.android.tools.r8.internal.GK0:
+com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal -> com.android.tools.r8.internal.JK0:
     java.util.Map states -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List newlySeenButNotFinishedRoots -> d
@@ -114727,18 +114987,18 @@ com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHi
     13:15:void com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal.markFinished(com.android.tools.r8.graph.DexProgramClass):183:185 -> k
     13:15:void traverse(com.android.tools.r8.graph.DexProgramClass):129 -> k
     void visit(com.android.tools.r8.graph.DexProgramClass) -> l
-com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal$TraversalState -> com.android.tools.r8.internal.FK0:
+com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal$TraversalState -> com.android.tools.r8.internal.IK0:
     com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal$TraversalState SEEN -> a
     com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal$TraversalState FINISHED -> b
     1:5:void <clinit>():30:34 -> <clinit>
     1:1:void <init>(java.lang.String,int):26:26 -> <init>
-com.android.tools.r8.optimize.argumentpropagation.utils.StronglyConnectedProgramClasses -> com.android.tools.r8.internal.vp1:
+com.android.tools.r8.optimize.argumentpropagation.utils.StronglyConnectedProgramClasses -> com.android.tools.r8.internal.np1:
     1:10:java.util.List computeStronglyConnectedProgramClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):25:34 -> a
     11:14:java.util.Set internalComputeStronglyConnectedProgramClasses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):41:44 -> a
     15:15:void com.android.tools.r8.graph.ImmediateProgramSubtypingInfo.forEachImmediateProgramSuperClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):68:68 -> a
     15:15:java.util.Set internalComputeStronglyConnectedProgramClasses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):44 -> a
     16:18:java.util.Set internalComputeStronglyConnectedProgramClasses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):45:47 -> a
-com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils -> com.android.tools.r8.internal.Et1:
+com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils -> com.android.tools.r8.internal.xt1:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <clinit>
     1:2:com.android.tools.r8.ir.analysis.type.DynamicType widenDynamicReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType):26:27 -> a
@@ -114756,7 +115016,7 @@ com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils -> com.and
     21:21:boolean shouldWidenDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):62 -> a
     22:46:boolean shouldWidenDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):62:86 -> a
     47:47:boolean shouldWidenDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):85:85 -> a
-com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting -> com.android.tools.r8.internal.xC0:
+com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting -> com.android.tools.r8.internal.AC0:
     com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingResult result -> b
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple feedback -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -114782,7 +115042,7 @@ com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting -> com.android.tools
     112:112:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):217:217 -> a
     113:116:boolean com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.mayBecomeInaccessibleAfterHoisting(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):292:295 -> a
     113:116:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):220 -> a
-    117:117:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():485:485 -> a
+    117:117:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():427:427 -> a
     117:117:boolean com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.mayBecomeInaccessibleAfterHoisting(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):295 -> a
     117:117:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):220 -> a
     118:130:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):226:238 -> a
@@ -114815,7 +115075,7 @@ com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting -> com.android.tools
     218:218:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):306:306 -> a
     218:218:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
     219:219:java.util.List lambda$hoistBridgeIfPossible$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):201:201 -> a
-com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens -> com.android.tools.r8.internal.yC0:
+com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens -> com.android.tools.r8.internal.BC0:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap bridgeToHoistedBridgeMap -> f
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneMap):25:26 -> <init>
     com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod) -> a
@@ -114834,7 +115094,7 @@ com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens -> com.android.t
     1:1:boolean hasCodeRewritings():78:78 -> e
     1:2:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):42:43 -> f
     3:3:boolean isContextFreeForMethods():73:73 -> f
-com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingResult -> com.android.tools.r8.internal.zC0:
+com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingResult -> com.android.tools.r8.internal.CC0:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap bridgeToHoistedBridgeMap -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -114901,7 +115161,7 @@ com.android.tools.r8.org.objectweb.asm.AnnotationWriter -> com.android.tools.r8.
     179:181:int computeParameterAnnotationsSize(java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter[],int):498:500 -> a
     182:205:void putParameterAnnotations(int,com.android.tools.r8.org.objectweb.asm.AnnotationWriter[],int,com.android.tools.r8.org.objectweb.asm.ByteVector):526:549 -> a
     1:8:int computeAnnotationsSize(java.lang.String):334:341 -> b
-com.android.tools.r8.org.objectweb.asm.Attribute -> com.android.tools.r8.internal.CA0:
+com.android.tools.r8.org.objectweb.asm.Attribute -> com.android.tools.r8.internal.FA0:
     byte[] content -> b
     java.lang.String type -> a
     com.android.tools.r8.org.objectweb.asm.Attribute nextAttribute -> c
@@ -114914,7 +115174,7 @@ com.android.tools.r8.org.objectweb.asm.Attribute -> com.android.tools.r8.interna
     14:27:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int):247:260 -> a
     28:36:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):307:315 -> a
     37:47:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):336:346 -> a
-com.android.tools.r8.org.objectweb.asm.Attribute$Set -> com.android.tools.r8.internal.BA0:
+com.android.tools.r8.org.objectweb.asm.Attribute$Set -> com.android.tools.r8.internal.EA0:
     com.android.tools.r8.org.objectweb.asm.Attribute[] data -> b
     int size -> a
     1:6:void <init>():351:356 -> <init>
@@ -114924,7 +115184,7 @@ com.android.tools.r8.org.objectweb.asm.Attribute$Set -> com.android.tools.r8.int
     5:10:void com.android.tools.r8.org.objectweb.asm.Attribute$Set.add(com.android.tools.r8.org.objectweb.asm.Attribute):384:389 -> a
     5:10:void addAttributes(com.android.tools.r8.org.objectweb.asm.Attribute):362 -> a
     11:11:void addAttributes(com.android.tools.r8.org.objectweb.asm.Attribute):364:364 -> a
-com.android.tools.r8.org.objectweb.asm.ByteVector -> com.android.tools.r8.internal.JC0:
+com.android.tools.r8.org.objectweb.asm.ByteVector -> com.android.tools.r8.internal.MC0:
     byte[] data -> a
     int length -> b
     1:2:void <init>():45:46 -> <init>
@@ -114944,7 +115204,7 @@ com.android.tools.r8.org.objectweb.asm.ByteVector -> com.android.tools.r8.intern
     16:26:com.android.tools.r8.org.objectweb.asm.ByteVector put122(int,int,int):195:205 -> b
     1:10:com.android.tools.r8.org.objectweb.asm.ByteVector putInt(int):172:181 -> c
     1:8:com.android.tools.r8.org.objectweb.asm.ByteVector putShort(int):110:117 -> d
-com.android.tools.r8.org.objectweb.asm.ClassReader -> com.android.tools.r8.internal.lH0:
+com.android.tools.r8.org.objectweb.asm.ClassReader -> com.android.tools.r8.internal.oH0:
     int[] bootstrapMethodOffsets -> f
     byte[] classFileBuffer -> b
     int[] cpInfoOffsets -> c
@@ -115137,13 +115397,13 @@ com.android.tools.r8.org.objectweb.asm.ClassReader -> com.android.tools.r8.inter
     1:2:short readShort(int):3607:3608 -> f
     3:9:java.lang.String readUtf(int,char[]):3669:3675 -> f
     1:2:int readUnsignedShort(int):3595:3596 -> g
-com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.internal.vH0:
+com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.internal.yH0:
     java.lang.String className -> a
     int constantPoolCount -> b
     1:3:void <init>(java.lang.String,int):49:51 -> <init>
     1:1:java.lang.String getClassName():60:60 -> a
     1:1:int getConstantPoolCount():69:69 -> b
-com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.internal.zH0:
+com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.internal.CH0:
     com.android.tools.r8.org.objectweb.asm.ClassVisitor cv -> b
     int api -> a
     1:1:void <init>(int):58:58 -> <init>
@@ -115169,7 +115429,7 @@ com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.inte
     12:12:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):305:305 -> b
     1:5:void visitPermittedSubclass(java.lang.String):265:269 -> c
     6:6:void visitPermittedSubclass(java.lang.String):266:266 -> c
-com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.internal.JH0:
+com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.internal.MH0:
 # {"id":"sourceFile","fileName":"ClassWriter.java"}
     int numberOfInnerClasses -> n
     com.android.tools.r8.org.objectweb.asm.FieldWriter firstField -> j
@@ -115231,7 +115491,7 @@ com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.inter
     295:295:byte[] toByteArray():720:720 -> b
     296:296:byte[] toByteArray():599:599 -> b
     1:5:void visitPermittedSubclass(java.lang.String):377:381 -> c
-com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.internal.AJ0:
+com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.internal.DJ0:
     java.lang.Object[] bootstrapMethodArguments -> d
     java.lang.String name -> a
     java.lang.String descriptor -> b
@@ -115246,7 +115506,7 @@ com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.i
     1:8:boolean equals(java.lang.Object):150:157 -> equals
     1:4:int hashCode():162:165 -> hashCode
     1:7:java.lang.String toString():170:176 -> toString
-com.android.tools.r8.org.objectweb.asm.Constants -> com.android.tools.r8.internal.GJ0:
+com.android.tools.r8.org.objectweb.asm.Constants -> com.android.tools.r8.internal.JJ0:
 # {"id":"sourceFile","fileName":"Constants.java"}
     1:2:void checkAsmExperimental(java.lang.Object):186:187 -> a
     3:10:boolean com.android.tools.r8.org.objectweb.asm.Constants.isWhitelisted(java.lang.String):194:201 -> a
@@ -115258,7 +115518,7 @@ com.android.tools.r8.org.objectweb.asm.Constants -> com.android.tools.r8.interna
     24:24:void checkAsmExperimental(java.lang.Object):189 -> a
     25:25:void com.android.tools.r8.org.objectweb.asm.Constants.checkIsPreview(java.io.InputStream):207:207 -> a
     25:25:void checkAsmExperimental(java.lang.Object):189 -> a
-com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.internal.LJ0:
+com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.internal.OJ0:
     int currentFrameType -> n
     java.lang.String currentMethodDescriptor -> f
     int currentFrameLocalCount -> o
@@ -115279,15 +115539,15 @@ com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.internal.
     int[] currentLocalVariableAnnotationRangeIndices -> l
     int currentFrameLocalCountDelta -> p
     1:1:void <init>():36:36 -> <init>
-com.android.tools.r8.org.objectweb.asm.CurrentFrame -> com.android.tools.r8.internal.PJ0:
+com.android.tools.r8.org.objectweb.asm.CurrentFrame -> com.android.tools.r8.internal.SJ0:
     1:1:void <init>(com.android.tools.r8.org.objectweb.asm.Label):40:40 -> <init>
     1:4:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):51:54 -> a
-com.android.tools.r8.org.objectweb.asm.Edge -> com.android.tools.r8.internal.WM0:
+com.android.tools.r8.org.objectweb.asm.Edge -> com.android.tools.r8.internal.ZM0:
     com.android.tools.r8.org.objectweb.asm.Label successor -> b
     int info -> a
     com.android.tools.r8.org.objectweb.asm.Edge nextEdge -> c
     1:4:void <init>(int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Edge):86:89 -> <init>
-com.android.tools.r8.org.objectweb.asm.FieldVisitor -> com.android.tools.r8.internal.jP0:
+com.android.tools.r8.org.objectweb.asm.FieldVisitor -> com.android.tools.r8.internal.mP0:
     com.android.tools.r8.org.objectweb.asm.FieldVisitor fv -> b
     int api -> a
     1:1:void <init>(int):57:57 -> <init>
@@ -115297,7 +115557,7 @@ com.android.tools.r8.org.objectweb.asm.FieldVisitor -> com.android.tools.r8.inte
     8:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):117:117 -> a
     9:10:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):131:132 -> a
     11:12:void visitEnd():141:142 -> a
-com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.internal.kP0:
+com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.internal.nP0:
     com.android.tools.r8.org.objectweb.asm.Attribute firstAttribute -> m
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> i
     com.android.tools.r8.org.objectweb.asm.SymbolTable symbolTable -> c
@@ -115319,7 +115579,7 @@ com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.inter
     67:67:void putFieldInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):272 -> a
     68:68:void collectAttributePrototypes(com.android.tools.r8.org.objectweb.asm.Attribute$Set):282:282 -> a
     1:14:int computeFieldInfoSize():195:208 -> b
-com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.internal.VP0:
+com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.internal.YP0:
     short outputStackTop -> g
     short outputStackStart -> f
     int[] initializations -> i
@@ -115416,7 +115676,7 @@ com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.internal.VP
     12:16:int pop():567:571 -> b
     17:23:void pop(int):581:587 -> b
     1:16:void push(int):524:539 -> c
-com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.internal.XQ0:
+com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.internal.aR0:
     boolean isInterface -> e
     java.lang.String name -> c
     java.lang.String owner -> b
@@ -115431,7 +115691,7 @@ com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.internal.X
     1:9:boolean equals(java.lang.Object):159:167 -> equals
     1:3:int hashCode():172:174 -> hashCode
     1:1:java.lang.String toString():187:187 -> toString
-com.android.tools.r8.org.objectweb.asm.Handler -> com.android.tools.r8.internal.YQ0:
+com.android.tools.r8.org.objectweb.asm.Handler -> com.android.tools.r8.internal.bR0:
     com.android.tools.r8.org.objectweb.asm.Handler nextHandler -> f
     com.android.tools.r8.org.objectweb.asm.Label handlerPc -> c
     int catchType -> d
@@ -115447,7 +115707,7 @@ com.android.tools.r8.org.objectweb.asm.Handler -> com.android.tools.r8.internal.
     25:26:void com.android.tools.r8.org.objectweb.asm.Handler.<init>(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):106:107 -> a
     25:26:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):147 -> a
     27:28:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):147:148 -> a
-com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.internal.R31:
+com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.internal.U31:
     com.android.tools.r8.org.objectweb.asm.Frame frame -> k
     com.android.tools.r8.org.objectweb.asm.Edge outgoingEdges -> m
     int bytecodeOffset -> e
@@ -115475,7 +115735,7 @@ com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.internal.R3
     92:126:void addSubroutineRetSuccessors(com.android.tools.r8.org.objectweb.asm.Label):542:576 -> a
     1:13:com.android.tools.r8.org.objectweb.asm.Label pushSuccessors(com.android.tools.r8.org.objectweb.asm.Label):592:604 -> b
     1:1:java.lang.String toString():620:620 -> toString
-com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.internal.T71:
+com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.internal.W71:
     java.lang.String className -> a
     int codeSize -> d
     java.lang.String descriptor -> c
@@ -115485,7 +115745,7 @@ com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.to
     1:1:int getCodeSize():97:97 -> b
     1:1:java.lang.String getDescriptor():88:88 -> c
     1:1:java.lang.String getMethodName():79:79 -> d
-com.android.tools.r8.org.objectweb.asm.MethodVisitor -> com.android.tools.r8.internal.U71:
+com.android.tools.r8.org.objectweb.asm.MethodVisitor -> com.android.tools.r8.internal.X71:
     int api -> h
     com.android.tools.r8.org.objectweb.asm.MethodVisitor mv -> i
     1:1:void <init>(int):71:71 -> <init>
@@ -115530,7 +115790,7 @@ com.android.tools.r8.org.objectweb.asm.MethodVisitor -> com.android.tools.r8.int
     7:8:void visitMaxs(int,int):772:773 -> c
     9:10:void visitEnd():782:783 -> c
     1:2:void visitVarInsn(int,int):358:359 -> d
-com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.internal.V71:
+com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.internal.Y71:
     boolean hasSubroutines -> d0
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleAnnotation -> I
     int nameIndex -> l
@@ -115722,7 +115982,7 @@ com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.inte
     107:107:void com.android.tools.r8.org.objectweb.asm.MethodWriter.putFrame():1914:1914 -> h
     107:107:void visitFrameEnd():1850 -> h
     108:111:void visitFrameEnd():1851:1854 -> h
-com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> com.android.tools.r8.internal.u81:
+com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> com.android.tools.r8.internal.x81:
     com.android.tools.r8.org.objectweb.asm.ModuleVisitor mv -> a
     1:1:void <init>(int):57:57 -> <init>
     2:16:void <init>(int,com.android.tools.r8.org.objectweb.asm.ModuleVisitor):68:82 -> <init>
@@ -115734,7 +115994,7 @@ com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> com.android.tools.r8.int
     1:2:void visitPackage(java.lang.String):102:103 -> b
     3:4:void visitOpen(java.lang.String,int,java.lang.String[]):146:147 -> b
     1:2:void visitUse(java.lang.String):158:159 -> c
-com.android.tools.r8.org.objectweb.asm.ModuleWriter -> com.android.tools.r8.internal.v81:
+com.android.tools.r8.org.objectweb.asm.ModuleWriter -> com.android.tools.r8.internal.y81:
     com.android.tools.r8.org.objectweb.asm.ByteVector usesIndex -> m
     int providesCount -> n
     com.android.tools.r8.org.objectweb.asm.ByteVector opens -> k
@@ -115764,7 +116024,7 @@ com.android.tools.r8.org.objectweb.asm.ModuleWriter -> com.android.tools.r8.inte
     13:23:int computeAttributesSize():196:206 -> b
     1:2:void visitUse(java.lang.String):160:161 -> c
     3:3:int getAttributeCount():186:186 -> c
-com.android.tools.r8.org.objectweb.asm.Opcodes -> com.android.tools.r8.internal.qd1:
+com.android.tools.r8.org.objectweb.asm.Opcodes -> com.android.tools.r8.internal.td1:
     java.lang.Integer FLOAT -> c
     java.lang.Integer DOUBLE -> d
     java.lang.Integer LONG -> e
@@ -115773,7 +116033,7 @@ com.android.tools.r8.org.objectweb.asm.Opcodes -> com.android.tools.r8.internal.
     java.lang.Integer TOP -> a
     java.lang.Integer INTEGER -> b
     1:7:void <clinit>():392:398 -> <clinit>
-com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor -> com.android.tools.r8.internal.Fi1:
+com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor -> com.android.tools.r8.internal.Di1:
     com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor delegate -> a
     1:1:void <init>(int):57:57 -> <init>
     2:16:void <init>(int,com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor):68:82 -> <init>
@@ -115781,7 +116041,7 @@ com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor -> com.android.too
     3:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):126:127 -> a
     5:6:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):138:139 -> a
     7:8:void visitEnd():148:149 -> a
-com.android.tools.r8.org.objectweb.asm.RecordComponentWriter -> com.android.tools.r8.internal.Gi1:
+com.android.tools.r8.org.objectweb.asm.RecordComponentWriter -> com.android.tools.r8.internal.Ei1:
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleTypeAnnotation -> h
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleTypeAnnotation -> i
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> f
@@ -115801,7 +116061,7 @@ com.android.tools.r8.org.objectweb.asm.RecordComponentWriter -> com.android.tool
     47:47:void putRecordComponentInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):213 -> a
     48:48:void collectAttributePrototypes(com.android.tools.r8.org.objectweb.asm.Attribute$Set):223:223 -> a
     1:9:int computeRecordComponentInfoSize():161:169 -> b
-com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.internal.Wp1:
+com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.internal.Op1:
     com.android.tools.r8.org.objectweb.asm.ClassWriter classWriter -> a
     int typeCount -> k
     int bootstrapMethodCount -> i
@@ -115943,7 +116203,7 @@ com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.inter
     2:2:int addType(java.lang.String):1140 -> e
     3:10:int addType(java.lang.String):1141:1148 -> e
     1:1:com.android.tools.r8.org.objectweb.asm.ClassReader getSource():288:288 -> f
-com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> com.android.tools.r8.internal.Vp1:
+com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> com.android.tools.r8.internal.Np1:
     long com.android.tools.r8.org.objectweb.asm.Symbol.data -> f
     int hashCode -> h
     int com.android.tools.r8.org.objectweb.asm.Symbol.info -> g
@@ -115971,7 +116231,7 @@ com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> com.android.tools.r8
     1:4:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():238:241 -> a
     1:4:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.internal.qr1:
+com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.internal.ir1:
     com.android.tools.r8.org.objectweb.asm.Type FLOAT_TYPE -> k
     com.android.tools.r8.org.objectweb.asm.Type INT_TYPE -> j
     com.android.tools.r8.org.objectweb.asm.Type DOUBLE_TYPE -> m
@@ -116030,7 +116290,7 @@ com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.internal.qr1
     1:1:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String):177:177 -> g
     1:4:int hashCode():877:880 -> hashCode
     1:1:java.lang.String toString():893:893 -> toString
-com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.internal.Cr1:
+com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.internal.ur1:
     byte[] typePathContainer -> a
     int typePathOffset -> b
     1:3:void <init>(byte[],int):72:74 -> <init>
@@ -116047,7 +116307,7 @@ com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.internal
     7:7:java.lang.String toString():174:174 -> toString
     8:8:java.lang.String toString():171:171 -> toString
     9:24:java.lang.String toString():168:183 -> toString
-com.android.tools.r8.org.objectweb.asm.TypeReference -> com.android.tools.r8.internal.Dr1:
+com.android.tools.r8.org.objectweb.asm.TypeReference -> com.android.tools.r8.internal.vr1:
     int targetTypeAndInfo -> a
     1:2:void <init>(int):193:194 -> <init>
     1:1:int getExceptionIndex():359:359 -> a
@@ -116058,7 +116318,7 @@ com.android.tools.r8.org.objectweb.asm.TypeReference -> com.android.tools.r8.int
     1:1:int getTypeArgumentIndex():382:382 -> f
     1:1:int getTypeParameterBoundIndex():327:327 -> g
     1:1:int getTypeParameterIndex():315:315 -> h
-com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter -> com.android.tools.r8.internal.EY0:
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter -> com.android.tools.r8.internal.HY0:
     java.util.BitSet mainSubroutineInsns -> F
     java.util.BitSet sharedSubroutineInsns -> H
     java.util.Map subroutinesInsns -> G
@@ -116097,7 +116357,7 @@ com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter -> com.android.
     103:105:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():315:317 -> c
     103:105:void visitEnd():155 -> c
     106:107:void visitEnd():157:158 -> c
-com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.internal.DY0:
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.internal.GY0:
     java.util.Map clonedLabels -> c
     com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation parent -> a
     java.util.BitSet subroutineInsns -> b
@@ -116114,7 +116374,7 @@ com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -
     1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.get(java.lang.Object):558:558 -> get
     1:1:java.lang.Object get(java.lang.Object):427 -> get
     1:1:int hashCode():568:568 -> hashCode
-com.android.tools.r8.org.objectweb.asm.signature.SignatureReader -> com.android.tools.r8.internal.Vm1:
+com.android.tools.r8.org.objectweb.asm.signature.SignatureReader -> com.android.tools.r8.internal.Nm1:
     java.lang.String signatureValue -> a
     1:2:void <init>(java.lang.String):49:50 -> <init>
     1:17:void accept(com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor):64:80 -> a
@@ -116126,7 +116386,7 @@ com.android.tools.r8.org.objectweb.asm.signature.SignatureReader -> com.android.
     230:230:int parseType(java.lang.String,int,com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor):229:229 -> a
     231:241:int parseType(java.lang.String,int,com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor):196:206 -> a
     242:242:int parseType(java.lang.String,int,com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor):168:168 -> a
-com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor -> com.android.tools.r8.internal.Wm1:
+com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor -> com.android.tools.r8.internal.Om1:
     1:9:void <init>(int):74:82 -> <init>
     com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitArrayType() -> a
     void visitBaseType(char) -> a
@@ -116195,7 +116455,7 @@ com.android.tools.r8.org.objectweb.asm.tree.AnnotationNode -> com.android.tools.
     82:90:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):151:159 -> a
     91:98:void accept(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):190:197 -> a
     99:115:void accept(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,java.lang.Object):211:227 -> a
-com.android.tools.r8.org.objectweb.asm.tree.ClassNode -> com.android.tools.r8.internal.VG0:
+com.android.tools.r8.org.objectweb.asm.tree.ClassNode -> com.android.tools.r8.internal.YG0:
     java.util.List invisibleTypeAnnotations -> f
     java.util.List visibleTypeAnnotations -> e
     java.util.List invisibleAnnotations -> d
@@ -116232,7 +116492,7 @@ com.android.tools.r8.org.objectweb.asm.tree.ClassNode -> com.android.tools.r8.in
     3:3:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):262 -> b
     4:4:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):263:263 -> b
     1:1:void visitPermittedSubclass(java.lang.String):249:249 -> c
-com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode -> com.android.tools.r8.internal.RO0:
+com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode -> com.android.tools.r8.internal.UO0:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -116240,7 +116500,7 @@ com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode -> com.android.tools.r
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):88:89 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):94:94 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.FieldNode -> com.android.tools.r8.internal.WO0:
+com.android.tools.r8.org.objectweb.asm.tree.FieldNode -> com.android.tools.r8.internal.ZO0:
     java.util.List visibleTypeAnnotations -> f
     java.util.List invisibleAnnotations -> e
     java.util.List visibleAnnotations -> d
@@ -116252,7 +116512,7 @@ com.android.tools.r8.org.objectweb.asm.tree.FieldNode -> com.android.tools.r8.in
     1:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):144:148 -> a
     6:10:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):156:160 -> a
     11:11:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):167:167 -> a
-com.android.tools.r8.org.objectweb.asm.tree.FrameNode -> com.android.tools.r8.internal.WP0:
+com.android.tools.r8.org.objectweb.asm.tree.FrameNode -> com.android.tools.r8.internal.ZP0:
     int type -> g
     java.util.List stack -> i
     java.util.List local -> h
@@ -116271,16 +116531,16 @@ com.android.tools.r8.org.objectweb.asm.tree.FrameNode -> com.android.tools.r8.in
     25:44:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):152:171 -> a
     45:51:java.lang.Object[] asArray(java.util.List):178:184 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode -> com.android.tools.r8.internal.nS0:
+com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode -> com.android.tools.r8.internal.qS0:
     int incr -> h
     int var -> g
     1:3:void <init>(int,int):54:56 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:67 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72:72 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.InnerClassNode -> com.android.tools.r8.internal.RT0:
+com.android.tools.r8.org.objectweb.asm.tree.InnerClassNode -> com.android.tools.r8.internal.UT0:
     1:1:void <init>(java.lang.String,java.lang.String,java.lang.String,int):70:70 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.InsnList -> com.android.tools.r8.internal.TT0:
+com.android.tools.r8.org.objectweb.asm.tree.InsnList -> com.android.tools.r8.internal.WT0:
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode[] cache -> d
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode firstInsn -> b
     int size -> a
@@ -116303,7 +116563,7 @@ com.android.tools.r8.org.objectweb.asm.tree.InsnList -> com.android.tools.r8.int
     1:1:java.util.ListIterator com.android.tools.r8.org.objectweb.asm.tree.InsnList.iterator():156 -> iterator
     1:1:java.util.Iterator iterator():38 -> iterator
     1:1:int size():61:61 -> size
-com.android.tools.r8.org.objectweb.asm.tree.InsnList$InsnListIterator -> com.android.tools.r8.internal.ST0:
+com.android.tools.r8.org.objectweb.asm.tree.InsnList$InsnListIterator -> com.android.tools.r8.internal.VT0:
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode nextInsn -> a
     com.android.tools.r8.org.objectweb.asm.tree.InsnList this$0 -> d
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode previousInsn -> b
@@ -116321,18 +116581,18 @@ com.android.tools.r8.org.objectweb.asm.tree.InsnList$InsnListIterator -> com.and
     1:7:int previousIndex():568:574 -> previousIndex
     1:10:void remove():525:534 -> remove
     1:9:void set(java.lang.Object):592:600 -> set
-com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> com.android.tools.r8.internal.UT0:
+com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> com.android.tools.r8.internal.XT0:
     1:1:void <init>(int):55:55 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):65:66 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):71:71 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode -> com.android.tools.r8.internal.zW0:
+com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode -> com.android.tools.r8.internal.CW0:
     int operand -> g
     1:2:void <init>(int,int):51:52 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):71:72 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):77:77 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode -> com.android.tools.r8.internal.RX0:
+com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode -> com.android.tools.r8.internal.UX0:
     java.lang.String name -> g
     java.lang.String desc -> h
     com.android.tools.r8.org.objectweb.asm.Handle bsm -> i
@@ -116341,7 +116601,7 @@ com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode -> com.android
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):84:85 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90:90 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode -> com.android.tools.r8.internal.aZ0:
+com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode -> com.android.tools.r8.internal.dZ0:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode label -> g
     1:2:void <init>(int,com.android.tools.r8.org.objectweb.asm.tree.LabelNode):57:58 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):79:80 -> a
@@ -116350,7 +116610,7 @@ com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode -> com.android.tools.r8
     4:4:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):85 -> a
     5:5:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):85:85 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.LabelNode -> com.android.tools.r8.internal.S31:
+com.android.tools.r8.org.objectweb.asm.tree.LabelNode -> com.android.tools.r8.internal.V31:
     com.android.tools.r8.org.objectweb.asm.Label value -> g
     1:1:void <init>():40:40 -> <init>
     1:1:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):68:68 -> a
@@ -116358,13 +116618,13 @@ com.android.tools.r8.org.objectweb.asm.tree.LabelNode -> com.android.tools.r8.in
     int getType() -> b
     1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():60:63 -> c
     1:1:void resetLabel():77:77 -> d
-com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode -> com.android.tools.r8.internal.s41:
+com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode -> com.android.tools.r8.internal.v41:
     java.lang.Object cst -> g
     1:2:void <init>(java.lang.Object):64:65 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):75:76 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):81:81 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode -> com.android.tools.r8.internal.N41:
+com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode -> com.android.tools.r8.internal.Q41:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> h
     int line -> g
     1:3:void <init>(int,com.android.tools.r8.org.objectweb.asm.tree.LabelNode):55:57 -> <init>
@@ -116374,14 +116634,14 @@ com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode -> com.android.tools.
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72 -> a
     4:4:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72:72 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.LocalVariableAnnotationNode -> com.android.tools.r8.internal.D51:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableAnnotationNode -> com.android.tools.r8.internal.G51:
     java.util.List start -> f
     java.util.List index -> h
     java.util.List end -> g
     1:4:void <init>(int,int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.tree.LabelNode[],com.android.tools.r8.org.objectweb.asm.tree.LabelNode[],int[],java.lang.String):116:119 -> <init>
     1:10:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor,boolean):129:138 -> a
     11:11:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor,boolean):137:137 -> a
-com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode -> com.android.tools.r8.internal.E51:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode -> com.android.tools.r8.internal.H51:
     int index -> f
     java.lang.String name -> a
     java.lang.String signature -> c
@@ -116389,7 +116649,7 @@ com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode -> com.android.too
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode end -> e
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> d
     1:7:void <init>(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,int):74:80 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.LookupSwitchInsnNode -> com.android.tools.r8.internal.h61:
+com.android.tools.r8.org.objectweb.asm.tree.LookupSwitchInsnNode -> com.android.tools.r8.internal.k61:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> g
     java.util.List labels -> i
     java.util.List keys -> h
@@ -116400,7 +116660,7 @@ com.android.tools.r8.org.objectweb.asm.tree.LookupSwitchInsnNode -> com.android.
     12:12:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):89 -> a
     13:15:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):89:91 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode -> com.android.tools.r8.internal.C71:
+com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode -> com.android.tools.r8.internal.F71:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -116409,7 +116669,7 @@ com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode -> com.android.tools.
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):115:116 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):121:121 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.MethodNode -> com.android.tools.r8.internal.G71:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode -> com.android.tools.r8.internal.J71:
     java.util.List attrs -> r
     java.util.List invisibleTypeAnnotations -> q
     com.android.tools.r8.org.objectweb.asm.tree.InsnList instructions -> x
@@ -116487,13 +116747,13 @@ com.android.tools.r8.org.objectweb.asm.tree.MethodNode -> com.android.tools.r8.i
     1:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):274:278 -> c
     6:7:void visitMaxs(int,int):517:518 -> c
     1:1:void visitVarInsn(int,int):353:353 -> d
-com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> com.android.tools.r8.internal.F71:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> com.android.tools.r8.internal.I71:
     com.android.tools.r8.org.objectweb.asm.tree.MethodNode this$0 -> a
     1:1:void <init>(com.android.tools.r8.org.objectweb.asm.tree.MethodNode,int):251:251 -> <init>
     1:2:boolean add(java.lang.Object):254:255 -> add
-com.android.tools.r8.org.objectweb.asm.tree.ModuleExportNode -> com.android.tools.r8.internal.p81:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleExportNode -> com.android.tools.r8.internal.s81:
     1:1:void <init>(java.lang.String,int,java.util.List):64:64 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.ModuleNode -> com.android.tools.r8.internal.q81:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleNode -> com.android.tools.r8.internal.t81:
     java.util.List packages -> b
     java.util.List uses -> f
     java.util.List opens -> e
@@ -116509,24 +116769,24 @@ com.android.tools.r8.org.objectweb.asm.tree.ModuleNode -> com.android.tools.r8.i
     1:4:void visitPackage(java.lang.String):140:143 -> b
     5:8:void visitOpen(java.lang.String,int,java.lang.String[]):164:167 -> b
     1:4:void visitUse(java.lang.String):172:175 -> c
-com.android.tools.r8.org.objectweb.asm.tree.ModuleOpenNode -> com.android.tools.r8.internal.r81:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleOpenNode -> com.android.tools.r8.internal.u81:
     1:1:void <init>(java.lang.String,int,java.util.List):64:64 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.ModuleProvideNode -> com.android.tools.r8.internal.s81:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleProvideNode -> com.android.tools.r8.internal.v81:
     1:1:void <init>(java.lang.String,java.util.List):53:53 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.ModuleRequireNode -> com.android.tools.r8.internal.t81:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleRequireNode -> com.android.tools.r8.internal.w81:
     1:1:void <init>(java.lang.String,int,java.lang.String):59:59 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode -> com.android.tools.r8.internal.F81:
+com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode -> com.android.tools.r8.internal.I81:
     java.lang.String desc -> g
     int dims -> h
     1:3:void <init>(java.lang.String,int):54:56 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:67 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72:72 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.ParameterNode -> com.android.tools.r8.internal.ee1:
+com.android.tools.r8.org.objectweb.asm.tree.ParameterNode -> com.android.tools.r8.internal.he1:
     java.lang.String name -> a
     int access -> b
     1:3:void <init>(java.lang.String,int):55:57 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.RecordComponentNode -> com.android.tools.r8.internal.Ei1:
+com.android.tools.r8.org.objectweb.asm.tree.RecordComponentNode -> com.android.tools.r8.internal.Ci1:
     java.util.List visibleAnnotations -> b
     java.util.List attrs -> f
     java.util.List invisibleTypeAnnotations -> e
@@ -116537,7 +116797,7 @@ com.android.tools.r8.org.objectweb.asm.tree.RecordComponentNode -> com.android.t
     1:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):108:112 -> a
     6:10:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):120:124 -> a
     11:11:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):131:131 -> a
-com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> com.android.tools.r8.internal.pq1:
+com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> com.android.tools.r8.internal.hq1:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> i
     int max -> h
     java.util.List labels -> j
@@ -116549,7 +116809,7 @@ com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> com.android.t
     8:8:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90 -> a
     9:10:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90:91 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode -> com.android.tools.r8.internal.or1:
+com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode -> com.android.tools.r8.internal.gr1:
     java.util.List invisibleTypeAnnotations -> f
     java.util.List visibleTypeAnnotations -> e
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> a
@@ -116561,24 +116821,24 @@ com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode -> com.android.too
     5:9:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):109:113 -> a
     10:19:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):112:121 -> a
     20:20:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):120:120 -> a
-com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.internal.xr1:
+com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.internal.pr1:
     int typeRef -> d
     com.android.tools.r8.org.objectweb.asm.TypePath typePath -> e
     1:3:void <init>(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String):62:64 -> <init>
     4:6:void <init>(int,int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String):82:84 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode -> com.android.tools.r8.internal.Br1:
+com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode -> com.android.tools.r8.internal.tr1:
     java.lang.String desc -> g
     1:2:void <init>(int,java.lang.String):56:57 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):77:78 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):83:83 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.Util -> com.android.tools.r8.internal.ws1:
+com.android.tools.r8.org.objectweb.asm.tree.Util -> com.android.tools.r8.internal.ps1:
     1:2:java.util.List add(java.util.List,java.lang.Object):44:45 -> a
     3:5:java.util.List asArrayList(int):50:52 -> a
     6:10:java.util.List asArrayList(java.lang.Object[]):59:63 -> a
     11:15:java.util.List asArrayList(int[]):114:118 -> a
     16:18:java.util.List asArrayList(int,java.lang.Object[]):157:159 -> a
-com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode -> com.android.tools.r8.internal.Os1:
+com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode -> com.android.tools.r8.internal.Hs1:
     int var -> g
     1:2:void <init>(int,int):53:54 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):74:75 -> a
@@ -116662,7 +116922,7 @@ com.android.tools.r8.org.objectweb.asm.tree.analysis.AnalyzerException -> com.an
     3:4:void <init>(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.lang.String,java.lang.Throwable):65:66 -> <init>
     5:7:void <init>(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.lang.String,java.lang.Object,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):82:82 -> <init>
     12:12:void <init>(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.lang.String,java.lang.Object,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):87:87 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue -> com.android.tools.r8.internal.lB0:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue -> com.android.tools.r8.internal.oB0:
     com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue FLOAT_VALUE -> d
     com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue INT_VALUE -> c
     com.android.tools.r8.org.objectweb.asm.Type type -> a
@@ -116678,7 +116938,7 @@ com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue -> com.android.t
     1:5:boolean equals(java.lang.Object):101:105 -> equals
     1:1:int hashCode():114:114 -> hashCode
     1:8:java.lang.String toString():119:126 -> toString
-com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicVerifier -> com.android.tools.r8.internal.mB0:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicVerifier -> com.android.tools.r8.internal.pB0:
     com.android.tools.r8.org.objectweb.asm.Type com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.NULL_TYPE -> h
     1:1:void com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.<clinit>():56:56 -> <clinit>
     1:1:void com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.<init>(int):79:79 -> <init>
@@ -116868,7 +117128,7 @@ com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicVerifier -> com.androi
     340:340:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.unaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue):231:231 -> b
     341:341:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.unaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue):229:229 -> b
     342:342:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.unaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue):225:225 -> b
-com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame -> com.android.tools.r8.internal.UP0:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame -> com.android.tools.r8.internal.XP0:
 # {"id":"sourceFile","fileName":"Frame.java"}
     int numStack -> d
     int maxStack -> e
@@ -117010,7 +117270,7 @@ com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame -> com.android.tools.
     7:7:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame.getStack(int):231:231 -> toString
     7:7:java.lang.String toString():748 -> toString
     8:10:java.lang.String toString():748:750 -> toString
-com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter -> com.android.tools.r8.internal.EX0:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter -> com.android.tools.r8.internal.HX0:
     1:1:void <init>(int):61:61 -> <init>
     com.android.tools.r8.org.objectweb.asm.tree.analysis.Value binaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value) -> a
     com.android.tools.r8.org.objectweb.asm.tree.analysis.Value copyOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value) -> a
@@ -117020,16 +117280,16 @@ com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter -> com.android.
     2:2:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newValue(com.android.tools.r8.org.objectweb.asm.Type):50:50 -> a
     2:2:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value newEmptyValue(int):126 -> a
     com.android.tools.r8.org.objectweb.asm.tree.analysis.Value unaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value) -> b
-com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine -> com.android.tools.r8.internal.Dp1:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine -> com.android.tools.r8.internal.vp1:
     java.util.List callers -> c
     boolean[] localsUsed -> b
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> a
     1:5:void <init>(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,int,com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode):61:65 -> <init>
     6:9:void <init>(com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine):73:76 -> <init>
     1:11:boolean merge(com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine):89:99 -> a
-com.android.tools.r8.org.objectweb.asm.tree.analysis.Value -> com.android.tools.r8.internal.Cs1:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.Value -> com.android.tools.r8.internal.vs1:
 # {"id":"sourceFile","fileName":"Value.java"}
-com.android.tools.r8.org.objectweb.asm.util.CheckAnnotationAdapter -> com.android.tools.r8.internal.OF0:
+com.android.tools.r8.org.objectweb.asm.util.CheckAnnotationAdapter -> com.android.tools.r8.internal.RF0:
     boolean useNamedValue -> b
     boolean visitEndCalled -> c
     1:2:void <init>(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,boolean):55:56 -> <init>
@@ -117043,7 +117303,7 @@ com.android.tools.r8.org.objectweb.asm.util.CheckAnnotationAdapter -> com.androi
     45:47:void visitEnd():119:121 -> a
     1:2:void checkName(java.lang.String):125:126 -> b
     3:4:void checkVisitEndNotCalled():131:132 -> b
-com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter -> com.android.tools.r8.internal.RF0:
+com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter -> com.android.tools.r8.internal.UF0:
     boolean visitNestHostCalled -> i
     java.lang.String nestMemberPackageName -> j
     boolean visitEndCalled -> k
@@ -117192,7 +117452,7 @@ com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter -> com.android.too
     3:3:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> h
     3:3:int checkTypeParameters(java.lang.String,int):695 -> h
     4:4:int checkTypeParameters(java.lang.String,int):696:696 -> h
-com.android.tools.r8.org.objectweb.asm.util.CheckFieldAdapter -> com.android.tools.r8.internal.SF0:
+com.android.tools.r8.org.objectweb.asm.util.CheckFieldAdapter -> com.android.tools.r8.internal.VF0:
     boolean visitEndCalled -> c
     1:1:void <init>(int,com.android.tools.r8.org.objectweb.asm.FieldVisitor):70:70 -> <init>
     1:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):75:78 -> a
@@ -117206,7 +117466,7 @@ com.android.tools.r8.org.objectweb.asm.util.CheckFieldAdapter -> com.android.too
     24:24:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):100:100 -> a
     25:27:void visitEnd():107:109 -> a
     1:2:void checkVisitEndNotCalled():113:114 -> b
-com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter -> com.android.tools.r8.internal.VF0:
+com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter -> com.android.tools.r8.internal.YF0:
     boolean visitCodeCalled -> n
     java.util.Map labelInsnIndices -> r
     int visibleAnnotableParameterCount -> l
@@ -117324,14 +117584,14 @@ com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter -> com.android.to
     80:80:void checkUnqualifiedName(int,java.lang.String,java.lang.String):1214:1214 -> d
     1:2:void checkVisitEndNotCalled():1060:1061 -> e
     1:2:void checkVisitMaxsNotCalled():1053:1054 -> f
-com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$1 -> com.android.tools.r8.internal.TF0:
+com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$1 -> com.android.tools.r8.internal.WF0:
     com.android.tools.r8.org.objectweb.asm.MethodVisitor val$methodVisitor -> F
     1:1:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.org.objectweb.asm.MethodVisitor):448:448 -> <init>
     1:5:void throwError(com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer,java.lang.Exception):470:474 -> a
     1:15:void visitEnd():451:465 -> c
     16:16:void visitEnd():462:462 -> c
     17:22:void visitEnd():455:460 -> c
-com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method -> com.android.tools.r8.internal.UF0:
+com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method -> com.android.tools.r8.internal.XF0:
     com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method VISIT_VAR_INSN -> c
     com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method VISIT_TYPE_INSN -> d
     com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method VISIT_FIELD_INSN -> e
@@ -117341,7 +117601,7 @@ com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method -> com.and
     com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method VISIT_INT_INSN -> b
     1:7:void <clinit>():73:79 -> <clinit>
     1:1:void <init>(java.lang.String,int):72:72 -> <init>
-com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter -> com.android.tools.r8.internal.XF0:
+com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter -> com.android.tools.r8.internal.aG0:
     com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter$NameSet requiredModules -> c
     boolean visitEndCalled -> i
     int classVersion -> h
@@ -117363,12 +117623,12 @@ com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter -> com.android.to
     16:16:void visitOpen(java.lang.String,int,java.lang.String[]):149:149 -> b
     17:18:void checkVisitEndNotCalled():192:193 -> b
     1:4:void visitUse(java.lang.String):164:167 -> c
-com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter$NameSet -> com.android.tools.r8.internal.WF0:
+com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter$NameSet -> com.android.tools.r8.internal.ZF0:
     java.util.HashSet names -> b
     java.lang.String type -> a
     1:3:void <init>(java.lang.String):202:204 -> <init>
     1:2:void checkNameNotAlreadyDeclared(java.lang.String):208:209 -> a
-com.android.tools.r8.org.objectweb.asm.util.CheckRecordComponentAdapter -> com.android.tools.r8.internal.aG0:
+com.android.tools.r8.org.objectweb.asm.util.CheckRecordComponentAdapter -> com.android.tools.r8.internal.dG0:
     boolean visitEndCalled -> b
     1:1:void <init>(int,com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor):74:74 -> <init>
     1:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):79:82 -> a
@@ -117382,7 +117642,7 @@ com.android.tools.r8.org.objectweb.asm.util.CheckRecordComponentAdapter -> com.a
     24:24:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):104:104 -> a
     25:27:void visitEnd():111:113 -> a
     1:2:void checkVisitEndNotCalled():117:118 -> b
-com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.internal.jf1:
+com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.internal.mf1:
     java.util.List text -> c
     java.lang.StringBuilder stringBuilder -> b
     java.lang.String[] TYPES -> e
@@ -117403,7 +117663,7 @@ com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.inte
     com.android.tools.r8.org.objectweb.asm.util.Printer visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
     1:23:void appendString(java.lang.StringBuilder,java.lang.String):1241:1263 -> a
     24:37:void appendString(java.lang.StringBuilder,java.lang.String):1253:1266 -> a
-com.android.tools.r8.org.objectweb.asm.util.Textifier -> com.android.tools.r8.internal.qq1:
+com.android.tools.r8.org.objectweb.asm.util.Textifier -> com.android.tools.r8.internal.iq1:
     java.lang.String tab2 -> g
     java.lang.String tab -> f
     java.lang.String ltab -> i
@@ -117533,7 +117793,7 @@ com.android.tools.r8.org.objectweb.asm.util.Textifier -> com.android.tools.r8.in
     16:16:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1587 -> b
     17:19:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1587:1589 -> b
     1:4:void visitAnnotationValue(java.lang.String):706:709 -> c
-com.android.tools.r8.org.objectweb.asm.util.TraceAnnotationVisitor -> com.android.tools.r8.internal.Sq1:
+com.android.tools.r8.org.objectweb.asm.util.TraceAnnotationVisitor -> com.android.tools.r8.internal.Kq1:
     com.android.tools.r8.org.objectweb.asm.util.Printer printer -> b
     1:2:void <init>(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.org.objectweb.asm.util.Printer):60:61 -> <init>
     1:2:void visit(java.lang.String,java.lang.Object):66:67 -> a
@@ -117541,7 +117801,7 @@ com.android.tools.r8.org.objectweb.asm.util.TraceAnnotationVisitor -> com.androi
     5:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):78:79 -> a
     7:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):84:85 -> a
     9:10:void visitEnd():90:91 -> a
-com.android.tools.r8.org.objectweb.asm.util.TraceMethodVisitor -> com.android.tools.r8.internal.Tq1:
+com.android.tools.r8.org.objectweb.asm.util.TraceMethodVisitor -> com.android.tools.r8.internal.Lq1:
     com.android.tools.r8.org.objectweb.asm.util.Printer p -> j
     1:2:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.util.Printer):65:66 -> <init>
     1:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):77:79 -> a
@@ -117661,7 +117921,7 @@ com.android.tools.r8.org.objectweb.asm.util.TraceMethodVisitor -> com.android.to
     2:4:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitVarInsn(int,int):892:894 -> d
     2:4:void visitVarInsn(int,int):147 -> d
     5:5:void visitVarInsn(int,int):148:148 -> d
-com.android.tools.r8.org.objectweb.asm.util.TraceSignatureVisitor -> com.android.tools.r8.internal.Wq1:
+com.android.tools.r8.org.objectweb.asm.util.TraceSignatureVisitor -> com.android.tools.r8.internal.Oq1:
     int arrayStack -> j
     java.lang.String separator -> k
     int argumentStack -> i
@@ -118077,7 +118337,7 @@ com.android.tools.r8.relocator.SimplePackagesRewritingMapper$RelocatorNamingLens
     4:4:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):132:132 -> a
     boolean verifyRenamingConsistentWithResolution(com.android.tools.r8.graph.DexMethod) -> b
     1:1:java.lang.String lookupPackageName(java.lang.String):112:112 -> b
-com.android.tools.r8.repackaging.Repackaging -> com.android.tools.r8.internal.Zk1:
+com.android.tools.r8.repackaging.Repackaging -> com.android.tools.r8.internal.Xk1:
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration repackagingConfiguration -> c
@@ -118086,10 +118346,10 @@ com.android.tools.r8.repackaging.Repackaging -> com.android.tools.r8.internal.Zk
     1:5:void <init>(com.android.tools.r8.graph.AppView):66:70 -> <init>
     1:3:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):76:78 -> a
     4:40:boolean verifyIdentityRepackaging(com.android.tools.r8.graph.AppView):86:122 -> a
-    41:41:void com.android.tools.r8.graph.AppView.rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):683:683 -> a
+    41:41:void com.android.tools.r8.graph.AppView.rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):688:688 -> a
     41:41:boolean verifyIdentityRepackaging(com.android.tools.r8.graph.AppView):123 -> a
     42:42:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):130:130 -> a
-    43:43:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1158:1158 -> a
+    43:43:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1164:1164 -> a
     43:43:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):130 -> a
     44:48:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):134:138 -> a
     49:63:void com.android.tools.r8.repackaging.Repackaging.processPackagesInDesiredLocation(com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,java.util.Set):202:216 -> a
@@ -118110,7 +118370,7 @@ com.android.tools.r8.repackaging.Repackaging -> com.android.tools.r8.internal.Zk
     117:117:boolean lambda$run$0(java.util.Map$Entry):142:142 -> a
     118:146:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramPackage,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):272:300 -> a
     147:147:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramPackage,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):298:298 -> a
-com.android.tools.r8.repackaging.Repackaging$1 -> com.android.tools.r8.internal.Uk1:
+com.android.tools.r8.repackaging.Repackaging$1 -> com.android.tools.r8.internal.Sk1:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():87:87 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):87:87 -> <init>
@@ -118118,10 +118378,10 @@ com.android.tools.r8.repackaging.Repackaging$1 -> com.android.tools.r8.internal.
     2:2:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):100:100 -> a
     3:3:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):105:105 -> a
     com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.repackaging.Repackaging$2 -> com.android.tools.r8.internal.Vk1:
+com.android.tools.r8.repackaging.Repackaging$2 -> com.android.tools.r8.internal.Tk1:
     1:1:void <init>(com.android.tools.r8.graph.AppView):109:109 -> <init>
     boolean isLegitimateToHaveEmptyMappings() -> k
-com.android.tools.r8.repackaging.Repackaging$DefaultRepackagingConfiguration -> com.android.tools.r8.internal.Wk1:
+com.android.tools.r8.repackaging.Repackaging$DefaultRepackagingConfiguration -> com.android.tools.r8.internal.Uk1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.Minifier$MinificationPackageNamingStrategy packageMinificationStrategy -> e
@@ -118131,23 +118391,23 @@ com.android.tools.r8.repackaging.Repackaging$DefaultRepackagingConfiguration ->
     1:1:void <clinit>():328:328 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.AppView):336:341 -> <init>
     1:5:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):346:350 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1166:1166 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1172:1172 -> a
     6:6:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):350 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1170:1170 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1176:1176 -> a
     7:7:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):352 -> a
     8:16:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):353:361 -> a
     17:22:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):358:363 -> a
-    23:23:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1162:1162 -> a
+    23:23:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1168:1168 -> a
     23:23:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):363 -> a
     24:29:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):363:368 -> a
     30:34:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):374:378 -> a
-    35:35:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1166:1166 -> a
+    35:35:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1172:1172 -> a
     35:35:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):378 -> a
     36:36:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):379:379 -> a
-    37:37:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1170:1170 -> a
+    37:37:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1176:1176 -> a
     37:37:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):380 -> a
     38:42:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):382:386 -> a
-    43:43:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1162:1162 -> a
+    43:43:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1168:1168 -> a
     43:43:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):386 -> a
     44:44:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):386:386 -> a
     45:60:com.android.tools.r8.graph.DexType getRepackagedType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):424:439 -> a
@@ -118155,8 +118415,8 @@ com.android.tools.r8.repackaging.Repackaging$DefaultRepackagingConfiguration ->
     61:65:com.android.tools.r8.graph.DexType getRepackagedType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):445 -> a
     66:66:com.android.tools.r8.graph.DexType getRepackagedType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):446:446 -> a
     1:13:boolean mayHavePinnedPackagePrivateOrProtectedItem(com.android.tools.r8.graph.ProgramPackage):397:409 -> b
-com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration -> com.android.tools.r8.internal.Xk1:
-com.android.tools.r8.repackaging.Repackaging$RepackagingTreeFixer -> com.android.tools.r8.internal.Yk1:
+com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration -> com.android.tools.r8.internal.Vk1:
+com.android.tools.r8.repackaging.Repackaging$RepackagingTreeFixer -> com.android.tools.r8.internal.Wk1:
     com.android.tools.r8.repackaging.RepackagingLens$Builder lensBuilder -> g
     com.android.tools.r8.com.google.common.collect.BiMap mappings -> f
     boolean $assertionsDisabled -> h
@@ -118172,7 +118432,7 @@ com.android.tools.r8.repackaging.Repackaging$RepackagingTreeFixer -> com.android
     6:6:void com.android.tools.r8.repackaging.RepackagingLens$Builder.recordMove(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):100:100 -> a
     6:6:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):191 -> a
     1:1:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):176:176 -> b
-com.android.tools.r8.repackaging.RepackagingAnnotationTracer -> com.android.tools.r8.internal.al1:
+com.android.tools.r8.repackaging.RepackagingAnnotationTracer -> com.android.tools.r8.internal.Yk1:
     com.android.tools.r8.repackaging.RepackagingUseRegistry registry -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():18:18 -> <clinit>
@@ -118197,7 +118457,7 @@ com.android.tools.r8.repackaging.RepackagingAnnotationTracer -> com.android.tool
     113:113:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():293:293 -> a
     113:113:void traceDexValue(com.android.tools.r8.graph.DexValue):90 -> a
     114:121:void traceDexValue(com.android.tools.r8.graph.DexValue):90:97 -> a
-com.android.tools.r8.repackaging.RepackagingConstraintGraph -> com.android.tools.r8.internal.cl1:
+com.android.tools.r8.repackaging.RepackagingConstraintGraph -> com.android.tools.r8.internal.al1:
     com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node libraryBoundaryNode -> e
     com.android.tools.r8.graph.ProgramPackage pkg -> b
     java.util.Map nodes -> c
@@ -118226,7 +118486,7 @@ com.android.tools.r8.repackaging.RepackagingConstraintGraph -> com.android.tools
     11:15:boolean com.android.tools.r8.graph.DexDefinition.isNotProgramDefinition(com.android.tools.r8.graph.AppView):141:145 -> b
     11:15:com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node getNode(com.android.tools.r8.graph.DexDefinition):82 -> b
     16:22:com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node getNode(com.android.tools.r8.graph.DexDefinition):83:89 -> b
-com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node -> com.android.tools.r8.internal.bl1:
+com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node -> com.android.tools.r8.internal.Zk1:
     com.android.tools.r8.graph.DexDefinition definitionForDebugging -> a
     java.util.Set neighbors -> b
     1:1:void <init>(com.android.tools.r8.graph.DexDefinition):201:201 -> <init>
@@ -118234,7 +118494,7 @@ com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node -> com.android.
     1:2:void addNeighbor(com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node):206:207 -> a
     3:3:java.util.Set getNeighbors():211:211 -> a
     1:1:java.lang.String toString():216:216 -> toString
-com.android.tools.r8.repackaging.RepackagingLens -> com.android.tools.r8.internal.fl1:
+com.android.tools.r8.repackaging.RepackagingLens -> com.android.tools.r8.internal.dl1:
     com.android.tools.r8.com.google.common.collect.BiMap newTypes -> n
     boolean $assertionsDisabled -> p
     java.util.Map packageRenamings -> o
@@ -118261,23 +118521,23 @@ com.android.tools.r8.repackaging.RepackagingLens -> com.android.tools.r8.interna
     25:28:boolean isSimpleTypeRenamingOrEqual(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexMember):77:80 -> a
     29:39:boolean com.android.tools.r8.utils.IterableUtils.testPairs(java.util.function.BiPredicate,java.lang.Iterable,java.lang.Iterable):183:193 -> a
     29:39:boolean isSimpleTypeRenamingOrEqual(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexMember):77 -> a
-com.android.tools.r8.repackaging.RepackagingLens$1 -> com.android.tools.r8.internal.dl1:
-com.android.tools.r8.repackaging.RepackagingLens$Builder -> com.android.tools.r8.internal.el1:
+com.android.tools.r8.repackaging.RepackagingLens$1 -> com.android.tools.r8.internal.bl1:
+com.android.tools.r8.repackaging.RepackagingLens$Builder -> com.android.tools.r8.internal.cl1:
     com.android.tools.r8.com.google.common.collect.BiMap newTypes -> a
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newFieldSignatures -> b
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newMethodSignatures -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():83:83 -> <clinit>
     1:6:void <init>():83:88 -> <init>
-com.android.tools.r8.repackaging.RepackagingUseRegistry -> com.android.tools.r8.internal.gl1:
-    com.android.tools.r8.graph.InitClassLens initClassLens -> g
-    com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> c
-    boolean $assertionsDisabled -> j
-    com.android.tools.r8.utils.InternalOptions options -> d
-    com.android.tools.r8.graph.ProgramDefinition context -> f
-    com.android.tools.r8.repackaging.RepackagingConstraintGraph constraintGraph -> e
-    com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node missingTypeNode -> i
-    com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node node -> h
+com.android.tools.r8.repackaging.RepackagingUseRegistry -> com.android.tools.r8.internal.el1:
+    com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> d
+    com.android.tools.r8.graph.InitClassLens initClassLens -> h
+    boolean $assertionsDisabled -> k
+    com.android.tools.r8.graph.ProgramDefinition context -> g
+    com.android.tools.r8.utils.InternalOptions options -> e
+    com.android.tools.r8.repackaging.RepackagingConstraintGraph constraintGraph -> f
+    com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node node -> i
+    com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node missingTypeNode -> j
     1:1:void <clinit>():35:35 -> <clinit>
     1:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.repackaging.RepackagingConstraintGraph,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node):50:57 -> <init>
     1:6:boolean isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.DexClass):61:66 -> a
@@ -118294,7 +118554,7 @@ com.android.tools.r8.repackaging.RepackagingUseRegistry -> com.android.tools.r8.
     45:51:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):152 -> a
     52:58:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):79:85 -> a
     52:58:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):152 -> a
-    59:59:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    59:59:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     59:59:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):86 -> a
     59:59:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):152 -> a
     60:62:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):86:88 -> a
@@ -118542,16 +118802,16 @@ com.android.tools.r8.retrace.StringRetrace -> com.android.tools.r8.retrace.Strin
     1:6:com.android.tools.r8.retrace.StringRetrace create(com.android.tools.r8.retrace.RetraceOptions):41:46 -> create
     1:2:java.util.List retrace(java.util.List):57:58 -> retrace
     3:4:java.util.List retrace(java.lang.String):69:70 -> retrace
-com.android.tools.r8.retrace.internal.Definition -> com.android.tools.r8.internal.BK0:
+com.android.tools.r8.retrace.internal.Definition -> com.android.tools.r8.internal.EK0:
 # {"id":"sourceFile","fileName":"Definition.java"}
-com.android.tools.r8.retrace.internal.DirectClassNameMapperProguardMapProducer -> com.android.tools.r8.internal.AM0:
+com.android.tools.r8.retrace.internal.DirectClassNameMapperProguardMapProducer -> com.android.tools.r8.internal.DM0:
     com.android.tools.r8.naming.ClassNameMapper getClassNameMapper() -> a
-com.android.tools.r8.retrace.internal.FieldDefinition -> com.android.tools.r8.internal.QO0:
+com.android.tools.r8.retrace.internal.FieldDefinition -> com.android.tools.r8.internal.TO0:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.retrace.internal.FieldDefinition substituteHolder(com.android.tools.r8.references.ClassReference) -> a
     1:1:com.android.tools.r8.retrace.internal.FieldDefinition create(com.android.tools.r8.references.ClassReference,java.lang.String):16:16 -> a
-com.android.tools.r8.retrace.internal.FieldDefinition$1 -> com.android.tools.r8.internal.NO0:
-com.android.tools.r8.retrace.internal.FieldDefinition$BaseFieldDefinition -> com.android.tools.r8.internal.OO0:
+com.android.tools.r8.retrace.internal.FieldDefinition$1 -> com.android.tools.r8.internal.QO0:
+com.android.tools.r8.retrace.internal.FieldDefinition$BaseFieldDefinition -> com.android.tools.r8.internal.RO0:
     com.android.tools.r8.references.ClassReference classReference -> a
     java.lang.String name -> b
     1:1:void <init>(com.android.tools.r8.references.ClassReference,java.lang.String,com.android.tools.r8.retrace.internal.FieldDefinition$1):25:25 -> <init>
@@ -118561,7 +118821,7 @@ com.android.tools.r8.retrace.internal.FieldDefinition$BaseFieldDefinition -> com
     1:1:com.android.tools.r8.references.ClassReference getHolderClass():41:41 -> getHolderClass
     1:1:java.lang.String getName():36:36 -> getName
     1:1:int hashCode():63:63 -> hashCode
-com.android.tools.r8.retrace.internal.FieldDefinition$FullFieldDefinition -> com.android.tools.r8.internal.PO0:
+com.android.tools.r8.retrace.internal.FieldDefinition$FullFieldDefinition -> com.android.tools.r8.internal.SO0:
     com.android.tools.r8.references.FieldReference fieldReference -> a
     1:1:void <init>(com.android.tools.r8.references.FieldReference,com.android.tools.r8.retrace.internal.FieldDefinition$1):67:67 -> <init>
     2:3:void <init>(com.android.tools.r8.references.FieldReference):71:72 -> <init>
@@ -118575,14 +118835,14 @@ com.android.tools.r8.retrace.internal.FieldDefinition$FullFieldDefinition -> com
     1:1:com.android.tools.r8.references.ClassReference getHolderClass():82:82 -> getHolderClass
     1:1:java.lang.String getName():77:77 -> getName
     1:1:int hashCode():105:105 -> hashCode
-com.android.tools.r8.retrace.internal.MethodDefinition -> com.android.tools.r8.internal.B71:
+com.android.tools.r8.retrace.internal.MethodDefinition -> com.android.tools.r8.internal.E71:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.retrace.internal.MethodDefinition$FullMethodDefinition asFullMethodDefinition() -> a
     com.android.tools.r8.retrace.internal.MethodDefinition substituteHolder(com.android.tools.r8.references.ClassReference) -> a
     1:1:com.android.tools.r8.retrace.internal.MethodDefinition create(com.android.tools.r8.references.ClassReference,java.lang.String):16:16 -> a
     2:2:com.android.tools.r8.retrace.internal.MethodDefinition create(com.android.tools.r8.references.MethodReference):20:20 -> a
-com.android.tools.r8.retrace.internal.MethodDefinition$1 -> com.android.tools.r8.internal.y71:
-com.android.tools.r8.retrace.internal.MethodDefinition$BaseMethodDefinition -> com.android.tools.r8.internal.z71:
+com.android.tools.r8.retrace.internal.MethodDefinition$1 -> com.android.tools.r8.internal.B71:
+com.android.tools.r8.retrace.internal.MethodDefinition$BaseMethodDefinition -> com.android.tools.r8.internal.C71:
     com.android.tools.r8.references.ClassReference classReference -> a
     java.lang.String name -> b
     1:1:void <init>(com.android.tools.r8.references.ClassReference,java.lang.String,com.android.tools.r8.retrace.internal.MethodDefinition$1):33:33 -> <init>
@@ -118592,7 +118852,7 @@ com.android.tools.r8.retrace.internal.MethodDefinition$BaseMethodDefinition -> c
     1:1:com.android.tools.r8.references.ClassReference getHolderClass():45:45 -> getHolderClass
     1:1:java.lang.String getName():50:50 -> getName
     1:1:int hashCode():72:72 -> hashCode
-com.android.tools.r8.retrace.internal.MethodDefinition$FullMethodDefinition -> com.android.tools.r8.internal.A71:
+com.android.tools.r8.retrace.internal.MethodDefinition$FullMethodDefinition -> com.android.tools.r8.internal.D71:
     com.android.tools.r8.references.MethodReference methodReference -> a
     1:1:void <init>(com.android.tools.r8.references.MethodReference,com.android.tools.r8.retrace.internal.MethodDefinition$1):76:76 -> <init>
     2:3:void <init>(com.android.tools.r8.references.MethodReference):80:81 -> <init>
@@ -118605,9 +118865,9 @@ com.android.tools.r8.retrace.internal.MethodDefinition$FullMethodDefinition -> c
     1:1:com.android.tools.r8.references.ClassReference getHolderClass():86:86 -> getHolderClass
     1:1:java.lang.String getName():91:91 -> getName
     1:1:int hashCode():132:132 -> hashCode
-com.android.tools.r8.retrace.internal.RetraceAbortException -> com.android.tools.r8.internal.wl1:
+com.android.tools.r8.retrace.internal.RetraceAbortException -> com.android.tools.r8.internal.ul1:
     1:1:void <init>():7:7 -> <init>
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl -> com.android.tools.r8.internal.zl1:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl -> com.android.tools.r8.internal.xl1:
     com.android.tools.r8.references.ClassReference obfuscatedReference -> a
     com.android.tools.r8.retrace.internal.RetracerImpl retracer -> c
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> b
@@ -118667,9 +118927,9 @@ com.android.tools.r8.retrace.internal.RetraceClassResultImpl -> com.android.tool
     6:6:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupMethod(java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):69:69 -> lookupMethod
     6:6:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):28 -> lookupMethod
     1:1:java.util.stream.Stream stream():176:176 -> stream
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor -> com.android.tools.r8.internal.xl1:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor -> com.android.tools.r8.internal.vl1:
     java.lang.Object create(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,java.util.List,java.lang.Object,com.android.tools.r8.retrace.Retracer) -> a
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl -> com.android.tools.r8.internal.yl1:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl -> com.android.tools.r8.internal.wl1:
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl classResult -> a
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> c
     com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl classReference -> b
@@ -118710,7 +118970,7 @@ com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElement
     5:13:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):201 -> retraceSourceFile
     14:14:com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.retraceSourceFile(java.lang.String):249:249 -> retraceSourceFile
     14:14:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):201 -> retraceSourceFile
-com.android.tools.r8.retrace.internal.RetraceFieldResultImpl -> com.android.tools.r8.internal.Cl1:
+com.android.tools.r8.retrace.internal.RetraceFieldResultImpl -> com.android.tools.r8.internal.Al1:
     java.util.List memberNamings -> a
     com.android.tools.r8.retrace.internal.FieldDefinition fieldDefinition -> b
     com.android.tools.r8.retrace.Retracer retracer -> c
@@ -118734,8 +118994,8 @@ com.android.tools.r8.retrace.internal.RetraceFieldResultImpl -> com.android.tool
     51:51:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.MemberNaming):72:72 -> a
     1:8:boolean isAmbiguous():85:92 -> isAmbiguous
     1:2:java.util.stream.Stream stream():43:44 -> stream
-com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$1 -> com.android.tools.r8.internal.Al1:
-com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl -> com.android.tools.r8.internal.Bl1:
+com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$1 -> com.android.tools.r8.internal.yl1:
+com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl -> com.android.tools.r8.internal.zl1:
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl classElement -> c
     com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl fieldReference -> a
     com.android.tools.r8.retrace.internal.RetraceFieldResultImpl retraceFieldResult -> b
@@ -118750,7 +119010,7 @@ com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl -> com.
     1:1:boolean isCompilerSynthesized():112:112 -> isCompilerSynthesized
     1:1:boolean isUnknown():117:117 -> isUnknown
     1:3:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):137:137 -> retraceSourceFile
-com.android.tools.r8.retrace.internal.RetraceFrameResultImpl -> com.android.tools.r8.internal.El1:
+com.android.tools.r8.retrace.internal.RetraceFrameResultImpl -> com.android.tools.r8.internal.Cl1:
     com.android.tools.r8.retrace.internal.MethodDefinition methodDefinition -> a
     java.util.List mappedRanges -> c
     com.android.tools.r8.retrace.Retracer retracer -> d
@@ -118775,7 +119035,7 @@ com.android.tools.r8.retrace.internal.RetraceFrameResultImpl -> com.android.tool
     73:73:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl getRetracedMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,int):129 -> a
     1:12:boolean isAmbiguous():52:63 -> isAmbiguous
     1:2:java.util.stream.Stream stream():72:73 -> stream
-com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl -> com.android.tools.r8.internal.Dl1:
+com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl -> com.android.tools.r8.internal.Bl1:
     com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl methodReference -> a
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl classElement -> c
     com.android.tools.r8.retrace.internal.RetraceFrameResultImpl retraceFrameResult -> b
@@ -118801,7 +119061,7 @@ com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl -> com.
     1:1:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl.getTopFrame():185:185 -> visitNonCompilerSynthesizedFrames
     1:1:void visitNonCompilerSynthesizedFrames(java.util.function.BiConsumer):206 -> visitNonCompilerSynthesizedFrames
     2:9:void visitNonCompilerSynthesizedFrames(java.util.function.BiConsumer):207:214 -> visitNonCompilerSynthesizedFrames
-com.android.tools.r8.retrace.internal.RetraceMethodResultImpl -> com.android.tools.r8.internal.Hl1:
+com.android.tools.r8.retrace.internal.RetraceMethodResultImpl -> com.android.tools.r8.internal.Fl1:
     com.android.tools.r8.retrace.internal.MethodDefinition methodDefinition -> a
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl classResult -> b
     java.util.List mappedRanges -> c
@@ -118824,8 +119084,8 @@ com.android.tools.r8.retrace.internal.RetraceMethodResultImpl -> com.android.too
     1:12:boolean isAmbiguous():44:55 -> isAmbiguous
     1:1:com.android.tools.r8.retrace.RetraceFrameResult narrowByPosition(int):22:22 -> narrowByPosition
     1:2:java.util.stream.Stream stream():100:101 -> stream
-com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$1 -> com.android.tools.r8.internal.Fl1:
-com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl -> com.android.tools.r8.internal.Gl1:
+com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$1 -> com.android.tools.r8.internal.Dl1:
+com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl -> com.android.tools.r8.internal.El1:
     com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl methodReference -> a
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl classElement -> c
     com.android.tools.r8.retrace.internal.RetraceMethodResultImpl retraceMethodResult -> b
@@ -118839,13 +119099,13 @@ com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl -> com
     1:1:boolean isCompilerSynthesized():145:145 -> isCompilerSynthesized
     1:1:boolean isUnknown():150:150 -> isUnknown
     1:3:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):171:171 -> retraceSourceFile
-com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl -> com.android.tools.r8.internal.Il1:
+com.android.tools.r8.retrace.internal.RetraceSourceFileResultImpl -> com.android.tools.r8.internal.Gl1:
     java.lang.String filename -> a
     boolean synthesized -> b
     1:3:void <init>(java.lang.String,boolean):14:16 -> <init>
     1:1:java.lang.String getFilename():26:26 -> getFilename
     1:1:boolean isSynthesized():21:21 -> isSynthesized
-com.android.tools.r8.retrace.internal.RetraceTypeResultImpl -> com.android.tools.r8.internal.Kl1:
+com.android.tools.r8.retrace.internal.RetraceTypeResultImpl -> com.android.tools.r8.internal.Il1:
     com.android.tools.r8.retrace.Retracer retracer -> b
     com.android.tools.r8.references.TypeReference obfuscatedType -> a
     1:3:void <init>(com.android.tools.r8.references.TypeReference,com.android.tools.r8.retrace.Retracer):19:21 -> <init>
@@ -118856,11 +119116,11 @@ com.android.tools.r8.retrace.internal.RetraceTypeResultImpl -> com.android.tools
     1:1:com.android.tools.r8.retrace.RetraceTypeResult forEach(java.util.function.Consumer):14 -> forEach
     1:13:java.util.stream.Stream stream():31:43 -> stream
     14:14:java.util.stream.Stream stream():32:32 -> stream
-com.android.tools.r8.retrace.internal.RetraceTypeResultImpl$ElementImpl -> com.android.tools.r8.internal.Jl1:
+com.android.tools.r8.retrace.internal.RetraceTypeResultImpl$ElementImpl -> com.android.tools.r8.internal.Hl1:
     com.android.tools.r8.retrace.RetracedTypeReference retracedType -> a
     1:2:void <init>(com.android.tools.r8.retrace.RetracedTypeReference):61:62 -> <init>
     1:1:com.android.tools.r8.retrace.RetracedTypeReference getType():67:67 -> getType
-com.android.tools.r8.retrace.internal.RetraceUtils -> com.android.tools.r8.internal.Ll1:
+com.android.tools.r8.retrace.internal.RetraceUtils -> com.android.tools.r8.internal.Jl1:
     java.util.Set KEEP_SOURCEFILE_NAMES -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():31:33 -> <clinit>
@@ -118882,7 +119142,7 @@ com.android.tools.r8.retrace.internal.RetraceUtils -> com.android.tools.r8.inter
     60:60:int firstNonWhiteSpaceCharacterFromIndex(java.lang.String,int):150:150 -> a
     61:66:int com.android.tools.r8.retrace.internal.RetraceUtils.firstFromIndex(java.lang.String,int,java.util.function.Predicate):158:163 -> a
     61:66:int firstNonWhiteSpaceCharacterFromIndex(java.lang.String,int):150 -> a
-com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl -> com.android.tools.r8.internal.Ml1:
+com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl -> com.android.tools.r8.internal.Kl1:
     com.android.tools.r8.references.ClassReference classReference -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
@@ -118895,12 +119155,12 @@ com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl -> com.android.
     1:1:com.android.tools.r8.retrace.RetracedTypeReference getRetracedType():10 -> getRetracedType
     1:1:java.lang.String getTypeName():25:25 -> getTypeName
     1:1:int hashCode():56:56 -> hashCode
-com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl -> com.android.tools.r8.internal.Ql1:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl -> com.android.tools.r8.internal.Ol1:
     1:1:void <init>(com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$1):12:12 -> <init>
     2:2:void <init>():14:14 -> <init>
     1:1:boolean isKnown():23:23 -> isKnown
-com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$1 -> com.android.tools.r8.internal.Nl1:
-com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$KnownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.Ol1:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$1 -> com.android.tools.r8.internal.Ll1:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$KnownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.Ml1:
     com.android.tools.r8.references.FieldReference fieldReference -> a
     1:1:void <init>(com.android.tools.r8.references.FieldReference,com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$1):31:31 -> <init>
     2:3:void <init>(com.android.tools.r8.references.FieldReference):36:37 -> <init>
@@ -118911,7 +119171,7 @@ com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$KnownRetracedFi
     1:1:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$KnownRetracedFieldReferenceImpl.getHolderClass():52:52 -> getHolderClass
     1:1:com.android.tools.r8.retrace.RetracedClassReference getHolderClass():31 -> getHolderClass
     1:1:int hashCode():84:84 -> hashCode
-com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$UnknownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.Pl1:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$UnknownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.Nl1:
     com.android.tools.r8.retrace.internal.FieldDefinition fieldDefinition -> a
     1:1:void <init>(com.android.tools.r8.retrace.internal.FieldDefinition,com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$1):88:88 -> <init>
     2:3:void <init>(com.android.tools.r8.retrace.internal.FieldDefinition):92:93 -> <init>
@@ -118920,7 +119180,7 @@ com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$UnknownRetraced
     1:1:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$UnknownRetracedFieldReferenceImpl.getHolderClass():98:98 -> getHolderClass
     1:1:com.android.tools.r8.retrace.RetracedClassReference getHolderClass():88 -> getHolderClass
     1:1:int hashCode():120:120 -> hashCode
-com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl -> com.android.tools.r8.internal.Ul1:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl -> com.android.tools.r8.internal.Sl1:
     1:1:void <init>(com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$1):16:16 -> <init>
     2:2:void <init>():20:20 -> <init>
     1:6:int compareTo(com.android.tools.r8.retrace.RetracedMethodReference):39:44 -> a
@@ -118939,8 +119199,8 @@ com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl -> com.android
     43:43:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl create(com.android.tools.r8.references.MethodReference,int):194:194 -> a
     1:1:int com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$KnownRetracedMethodReferenceImpl.compareTo(java.lang.Object):58:58 -> compareTo
     1:1:boolean isKnown():29:29 -> isKnown
-com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$1 -> com.android.tools.r8.internal.Rl1:
-com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$KnownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.Sl1:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$1 -> com.android.tools.r8.internal.Pl1:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$KnownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.Ql1:
     com.android.tools.r8.references.MethodReference methodReference -> a
     int position -> b
     boolean $assertionsDisabled -> c
@@ -118959,7 +119219,7 @@ com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$KnownRetracedM
     1:1:boolean hasPosition():97:97 -> hasPosition
     1:1:int hashCode():135:135 -> hashCode
     1:1:boolean isVoid():77:77 -> isVoid
-com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$UnknownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.Tl1:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$UnknownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.Rl1:
     com.android.tools.r8.retrace.internal.MethodDefinition methodDefinition -> a
     int position -> b
     1:1:void <init>(com.android.tools.r8.retrace.internal.MethodDefinition,int,com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$1):139:139 -> <init>
@@ -118970,7 +119230,7 @@ com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$UnknownRetrace
     1:1:boolean com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$UnknownRetracedMethodReferenceImpl.hasPosition():161:161 -> getOriginalPositionOrDefault
     1:1:int getOriginalPositionOrDefault(int):166 -> getOriginalPositionOrDefault
     1:1:boolean hasPosition():161:161 -> hasPosition
-com.android.tools.r8.retrace.internal.RetracedTypeReferenceImpl -> com.android.tools.r8.internal.Vl1:
+com.android.tools.r8.retrace.internal.RetracedTypeReferenceImpl -> com.android.tools.r8.internal.Tl1:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.references.TypeReference typeReference -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -118986,7 +119246,7 @@ com.android.tools.r8.retrace.internal.RetracedTypeReferenceImpl -> com.android.t
     1:1:int hashCode():62:62 -> hashCode
     1:1:boolean isVoid():30:30 -> isVoid
     1:1:com.android.tools.r8.references.TypeReference toArray(int):35:35 -> toArray
-com.android.tools.r8.retrace.internal.RetracerImpl -> com.android.tools.r8.internal.Wl1:
+com.android.tools.r8.retrace.internal.RetracerImpl -> com.android.tools.r8.internal.Ul1:
     com.android.tools.r8.naming.ClassNameMapper classNameMapper -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():19:19 -> <clinit>
@@ -119004,7 +119264,7 @@ com.android.tools.r8.retrace.internal.RetracerImpl -> com.android.tools.r8.inter
     1:2:com.android.tools.r8.retrace.RetraceMethodResult retraceMethod(com.android.tools.r8.references.MethodReference):19 -> retraceMethod
     1:1:com.android.tools.r8.retrace.internal.RetraceTypeResultImpl com.android.tools.r8.retrace.internal.RetracerImpl.retraceType(com.android.tools.r8.references.TypeReference):75:75 -> retraceType
     1:1:com.android.tools.r8.retrace.RetraceTypeResult retraceType(com.android.tools.r8.references.TypeReference):19 -> retraceType
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl -> com.android.tools.r8.internal.Qn1:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl -> com.android.tools.r8.internal.In1:
     com.android.tools.r8.retrace.Retracer retracer -> a
     1:2:void <init>(com.android.tools.r8.retrace.Retracer):35:36 -> <init>
     void lambda$retraceFieldOrReturnType$10(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder) -> a
@@ -119039,14 +119299,14 @@ com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl -> com.
     3:4:java.util.stream.Stream retraceField(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassResult):134:135 -> b
     5:5:void lambda$retraceFieldOrReturnType$11(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder):173:173 -> b
     6:16:java.util.stream.Stream retracedMethodArguments(com.android.tools.r8.retrace.StackTraceElementProxy):191:201 -> b
-    17:18:java.lang.Object com.android.tools.r8.utils.ListUtils.fold(java.util.Collection,java.lang.Object,java.util.function.BiFunction):222:223 -> b
+    17:18:java.lang.Object com.android.tools.r8.utils.ListUtils.fold(java.util.Collection,java.lang.Object,java.util.function.BiFunction):230:231 -> b
     17:18:java.util.stream.Stream retracedMethodArguments(com.android.tools.r8.retrace.StackTraceElementProxy):202 -> b
     19:39:java.util.stream.Stream retracedMethodArguments(com.android.tools.r8.retrace.StackTraceElementProxy):202:222 -> b
     void lambda$retracedMethodArguments$14(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder) -> c
     1:2:java.util.stream.Stream retraceMethod(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassResult):86:87 -> c
     1:12:java.util.stream.Stream retrace(com.android.tools.r8.retrace.StackTraceElementProxy):41:52 -> retrace
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$1 -> com.android.tools.r8.internal.Nn1:
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl -> com.android.tools.r8.internal.Pn1:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$1 -> com.android.tools.r8.internal.Fn1:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl -> com.android.tools.r8.internal.Hn1:
     java.lang.String sourceFile -> g
     com.android.tools.r8.retrace.RetracedMethodReference retracedMethod -> c
     java.util.List methodArguments -> f
@@ -119098,7 +119358,7 @@ com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$Retrace
     1:1:boolean hasSourceFile():297:297 -> hasSourceFile
     1:1:boolean isAmbiguous():272:272 -> isAmbiguous
     1:1:boolean isTopFrame():277:277 -> isTopFrame
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder -> com.android.tools.r8.internal.On1:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder -> com.android.tools.r8.internal.Gn1:
     java.lang.String sourceFile -> g
     com.android.tools.r8.retrace.RetracedMethodReference methodContext -> c
     java.util.List methodArguments -> f
@@ -119132,7 +119392,7 @@ com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$Retrace
     9:13:com.android.tools.r8.retrace.RetraceStackTraceProxy access$100(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder):403 -> a
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder.setTopFrame(boolean):461:461 -> b
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder access$900(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl$Builder,boolean):403 -> b
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy -> com.android.tools.r8.internal.Wn1:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy -> com.android.tools.r8.internal.On1:
     java.util.List orderedIndices -> b
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex fieldOrReturnType -> h
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex methodArguments -> i
@@ -119178,20 +119438,20 @@ com.android.tools.r8.retrace.internal.StackTraceElementStringProxy -> com.androi
     1:1:boolean hasMethodName():68:68 -> hasMethodName
     1:9:java.lang.String com.android.tools.r8.retrace.internal.StackTraceElementStringProxy.toRetracedItem(com.android.tools.r8.retrace.RetraceStackTraceProxy,boolean):141:149 -> toRetracedItem
     1:9:java.lang.Object toRetracedItem(com.android.tools.r8.retrace.RetraceStackTraceProxy,boolean):23 -> toRetracedItem
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$1 -> com.android.tools.r8.internal.Rn1:
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType -> com.android.tools.r8.internal.Sn1:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$1 -> com.android.tools.r8.internal.Jn1:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType -> com.android.tools.r8.internal.Kn1:
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType BINARY -> a
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType TYPENAME -> b
     1:2:void <clinit>():162:163 -> <clinit>
     1:1:void <init>(java.lang.String,int):161:161 -> <init>
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex -> com.android.tools.r8.internal.Tn1:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex -> com.android.tools.r8.internal.Ln1:
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex NO_INDEX -> e
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType classNameType -> d
     1:1:void <clinit>():349:349 -> <clinit>
     1:1:void <init>(int,int,com.android.tools.r8.utils.TriFunction,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$1):347:347 -> <init>
     2:3:void <init>(int,int,com.android.tools.r8.utils.TriFunction,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType):361:362 -> <init>
     1:4:com.android.tools.r8.references.ClassReference getReference(java.lang.String):366:369 -> a
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder -> com.android.tools.r8.internal.Un1:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder -> com.android.tools.r8.internal.Mn1:
     java.util.List orderedIndices -> b
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex fieldOrReturnType -> h
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex methodArguments -> i
@@ -119233,7 +119493,7 @@ com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceEle
     43:43:java.lang.String lambda$registerMethodName$1(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):211 -> e
     1:7:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerSourceFile(int,int):219:225 -> f
     8:8:java.lang.String lambda$registerSourceFile$2(com.android.tools.r8.retrace.RetraceStackTraceProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):224:224 -> f
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex -> com.android.tools.r8.internal.Vn1:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex -> com.android.tools.r8.internal.Nn1:
     com.android.tools.r8.utils.TriFunction retracedString -> c
     int endIndex -> b
     int startIndex -> a
@@ -119241,7 +119501,7 @@ com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex -
     2:5:void <init>(int,int,com.android.tools.r8.utils.TriFunction):336:339 -> <init>
     1:1:com.android.tools.r8.utils.TriFunction access$100(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex):319:319 -> a
     2:2:boolean hasIndex():343:343 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser -> com.android.tools.r8.internal.lo1:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser -> com.android.tools.r8.internal.do1:
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$LineNumberGroup lineNumberGroup -> g
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldOrReturnTypeGroup fieldOrReturnTypeGroup -> h
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodNameGroup methodNameGroup -> j
@@ -119286,72 +119546,72 @@ com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser -> com.a
     2:2:com.android.tools.r8.retrace.StackTraceElementProxy parse(java.lang.Object):16 -> parse
     3:15:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser.parse(java.lang.String):61:73 -> parse
     3:15:com.android.tools.r8.retrace.StackTraceElementProxy parse(java.lang.Object):16 -> parse
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1 -> com.android.tools.r8.internal.Xn1:
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$BinaryNameGroup -> com.android.tools.r8.internal.Yn1:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1 -> com.android.tools.r8.internal.Pn1:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$BinaryNameGroup -> com.android.tools.r8.internal.Qn1:
     1:1:void <init>():222:222 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):222:222 -> <init>
     1:1:java.lang.String subExpression():226:226 -> a
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType getClassNameType():231:231 -> b
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup -> com.android.tools.r8.internal.ao1:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup -> com.android.tools.r8.internal.Sn1:
     1:1:void <init>():179:179 -> <init>
     1:1:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):185:185 -> a
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType getClassNameType() -> b
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup$1 -> com.android.tools.r8.internal.Zn1:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup$1 -> com.android.tools.r8.internal.Rn1:
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup this$0 -> b
     java.lang.String val$captureGroup -> a
     1:1:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup,java.lang.String):185:185 -> <init>
     boolean isClassHandler() -> a
     1:10:boolean matchHandler(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):188:197 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldNameGroup -> com.android.tools.r8.internal.bo1:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldNameGroup -> com.android.tools.r8.internal.Tn1:
     1:1:void <init>():255:255 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):255:255 -> <init>
     1:1:java.lang.String subExpression():259:259 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):264:264 -> a
     3:7:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):265:269 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldOrReturnTypeGroup -> com.android.tools.r8.internal.co1:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldOrReturnTypeGroup -> com.android.tools.r8.internal.Un1:
     1:1:void <init>():339:339 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):339:339 -> <init>
     1:1:java.lang.String subExpression():343:343 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):348:348 -> a
     3:7:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):349:353 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$LineNumberGroup -> com.android.tools.r8.internal.do1:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$LineNumberGroup -> com.android.tools.r8.internal.Vn1:
     1:1:void <init>():298:298 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):298:298 -> <init>
     1:1:java.lang.String subExpression():302:302 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):307:307 -> a
     3:7:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):308:312 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodArgumentsGroup -> com.android.tools.r8.internal.eo1:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodArgumentsGroup -> com.android.tools.r8.internal.Wn1:
     1:1:void <init>():359:359 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):359:359 -> <init>
     1:1:java.lang.String subExpression():363:363 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):368:368 -> a
     3:7:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):369:373 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodNameGroup -> com.android.tools.r8.internal.fo1:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodNameGroup -> com.android.tools.r8.internal.Xn1:
     1:1:void <init>():235:235 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):235:235 -> <init>
     1:1:java.lang.String subExpression():239:239 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):244:244 -> a
     3:7:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):245:249 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroup -> com.android.tools.r8.internal.go1:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroup -> com.android.tools.r8.internal.Yn1:
     1:1:void <init>():161:161 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):161:161 -> <init>
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String) -> a
     java.lang.String subExpression() -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler -> com.android.tools.r8.internal.ho1:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler -> com.android.tools.r8.internal.Zn1:
     boolean isClassHandler() -> a
     boolean matchHandler(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher) -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileGroup -> com.android.tools.r8.internal.io1:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileGroup -> com.android.tools.r8.internal.ao1:
     1:1:void <init>():275:275 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):275:275 -> <init>
     1:2:java.lang.String subExpression():281:282 -> a
     3:3:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):287:287 -> a
     4:8:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):288:292 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileLineNumberGroup -> com.android.tools.r8.internal.jo1:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileLineNumberGroup -> com.android.tools.r8.internal.bo1:
     1:1:void <init>():318:318 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):318:318 -> <init>
     1:1:java.lang.String subExpression():322:322 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):327:327 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$TypeNameGroup -> com.android.tools.r8.internal.ko1:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$TypeNameGroup -> com.android.tools.r8.internal.co1:
     1:1:void <init>():209:209 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):209:209 -> <init>
     1:1:java.lang.String subExpression():213:213 -> a
@@ -119368,14 +119628,12 @@ com.android.tools.r8.shaking.AbstractMethodRemover -> com.android.tools.r8.shaki
     3:7:void processClass(com.android.tools.r8.graph.DexType):43:47 -> a
     8:13:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):57:62 -> a
     8:13:void processClass(com.android.tools.r8.graph.DexType):47 -> a
-    14:30:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):63:79 -> a
-    14:30:void processClass(com.android.tools.r8.graph.DexType):47 -> a
-    31:46:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):69:84 -> a
-    31:46:void processClass(com.android.tools.r8.graph.DexType):47 -> a
-    47:51:void processClass(com.android.tools.r8.graph.DexType):49:53 -> a
-    52:52:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):189:189 -> a
-    52:52:void processClass(com.android.tools.r8.graph.DexType):53 -> a
-    53:53:void processClass(com.android.tools.r8.graph.DexType):54:54 -> a
+    14:20:void processClass(com.android.tools.r8.graph.DexType):47:53 -> a
+    21:21:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):189:189 -> a
+    21:21:void processClass(com.android.tools.r8.graph.DexType):53 -> a
+    22:22:void processClass(com.android.tools.r8.graph.DexType):54:54 -> a
+    23:27:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):63:67 -> a
+    28:40:boolean isNonAbstractPinnedOrWideningVisibility(com.android.tools.r8.graph.DexEncodedMethod):71:83 -> a
 com.android.tools.r8.shaking.AnnotationFixer -> com.android.tools.r8.internal.Yy0:
     com.android.tools.r8.graph.GraphLens lens -> a
     boolean $assertionsDisabled -> b
@@ -119581,21 +119839,21 @@ com.android.tools.r8.shaking.AnnotationRemover -> com.android.tools.r8.shaking.h
     175:175:boolean shouldRetainAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):300:300 -> a
     176:187:void stripAttributes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo):334:345 -> a
     188:188:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):336:336 -> a
-    189:189:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):166:166 -> a
+    189:189:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):170:170 -> a
     189:189:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):336 -> a
-    190:190:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():610:610 -> a
-    190:190:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):169 -> a
+    190:190:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():616:616 -> a
+    190:190:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):173 -> a
     190:190:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):336 -> a
-    191:191:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):172:172 -> a
+    191:191:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):176:176 -> a
     191:191:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):336 -> a
     192:192:boolean lambda$stripAttributes$9(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):342:342 -> a
     193:201:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):353:361 -> a
-    202:202:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):185:185 -> a
+    202:202:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):189:189 -> a
     202:202:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):361 -> a
-    203:203:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():610:610 -> a
-    203:203:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):188 -> a
+    203:203:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():616:616 -> a
+    203:203:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):192 -> a
     203:203:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):361 -> a
-    204:204:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):193:193 -> a
+    204:204:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):197:197 -> a
     204:204:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):361 -> a
     205:227:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):362:384 -> a
     228:230:void clearAnnotations(com.android.tools.r8.graph.AppView):389:391 -> a
@@ -119698,7 +119956,7 @@ com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.shaking
     29:29:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):307 -> a
     29:29:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):455 -> a
     30:30:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):457:457 -> a
-    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     31:31:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):535 -> a
     32:33:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):538:539 -> a
     34:44:void computeLargestCfVersion():545:555 -> a
@@ -119718,7 +119976,7 @@ com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.shaking
     112:117:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):862:867 -> a
     118:118:boolean isClassInliningAllowed(com.android.tools.r8.graph.DexProgramClass):965:965 -> a
     119:119:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):969:969 -> a
-    120:120:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():595:595 -> a
+    120:120:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():601:601 -> a
     120:120:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):969 -> a
     121:122:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):969:970 -> a
     123:123:boolean isAccessModificationAllowed(com.android.tools.r8.graph.ProgramDefinition):974:974 -> a
@@ -119754,7 +120012,7 @@ com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.shaking
     233:233:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1188 -> a
     234:234:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1177:1177 -> a
     234:234:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1188 -> a
-    235:235:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toMethodDefinitionOrNull(com.android.tools.r8.graph.DexClassAndMethod):318:318 -> a
+    235:235:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toMethodDefinitionOrNull(com.android.tools.r8.graph.DexClassAndMethod):260:260 -> a
     235:235:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1177 -> a
     235:235:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1188 -> a
     236:236:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1175:1175 -> a
@@ -119822,11 +120080,11 @@ com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.shaking
     41:50:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexDefinition):1435:1444 -> b
     1:6:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithMainDexInfo(com.android.tools.r8.shaking.MainDexInfo):384:389 -> c
     7:12:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):519:524 -> c
-    13:13:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.isCompanionClassType(com.android.tools.r8.graph.DexType):168:168 -> c
+    13:13:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.isCompanionClassType(com.android.tools.r8.graph.DexType):166:166 -> c
     13:13:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):524 -> c
-    14:14:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.isEmulatedLibraryClassType(com.android.tools.r8.graph.DexType):172:172 -> c
+    14:14:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.isEmulatedLibraryClassType(com.android.tools.r8.graph.DexType):170:170 -> c
     14:14:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):525 -> c
-    15:15:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.isVivifiedType(com.android.tools.r8.graph.DexType):141:141 -> c
+    15:15:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.isVivifiedType(com.android.tools.r8.graph.DexType):138:138 -> c
     15:15:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):527 -> c
     16:16:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):520:520 -> c
     17:18:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):812:813 -> c
@@ -119880,14 +120138,9 @@ com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.shaking
     1:1:boolean isForceInlineMethod(com.android.tools.r8.graph.DexMethod):623:623 -> g
     2:6:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):900:904 -> g
     7:13:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass):983:989 -> g
-    14:15:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):330:331 -> g
-    14:15:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass):990 -> g
-    16:16:boolean com.android.tools.r8.utils.TraversalContinuation.shouldContinue():17:17 -> g
-    16:16:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):331 -> g
-    16:16:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass):990 -> g
-    17:19:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):332:334 -> g
-    17:19:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass):990 -> g
-    20:20:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass):997:997 -> g
+    14:18:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):330:334 -> g
+    14:18:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass):990 -> g
+    19:19:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass):997:997 -> g
     1:1:boolean isKeepConstantArgumentsMethod(com.android.tools.r8.graph.DexMethod):655:655 -> h
     2:6:boolean hasPinnedInstanceInitializer(com.android.tools.r8.graph.DexType):1016:1020 -> h
     7:17:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$13(com.android.tools.r8.graph.DexProgramClass):1469:1479 -> h
@@ -119932,32 +120185,33 @@ com.android.tools.r8.shaking.AppInfoWithLivenessModifier -> com.android.tools.r8
     11:11:void modify(com.android.tools.r8.shaking.AppInfoWithLiveness):50 -> a
     12:12:void lambda$modify$0(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder):38:38 -> a
     13:15:void lambda$modify$1(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.DexField):44:46 -> a
-com.android.tools.r8.shaking.ClassInitFieldSynthesizer -> com.android.tools.r8.internal.mG0:
+com.android.tools.r8.shaking.ClassInitFieldSynthesizer -> com.android.tools.r8.internal.pG0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexField clinitField -> b
     com.android.tools.r8.graph.InitClassLens$Builder lensBuilder -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):32:32 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.AppView):30:34 -> <init>
-    1:3:void run(java.util.concurrent.ExecutorService):38:38 -> a
-    5:5:void run(java.util.concurrent.ExecutorService):40:40 -> a
-    6:15:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):44:53 -> a
-    16:27:boolean com.android.tools.r8.shaking.ClassInitFieldSynthesizer.isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):103:114 -> a
-    16:27:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):57 -> a
-    28:28:boolean com.android.tools.r8.graph.DexEncodedField.isPackagePrivate():246:246 -> a
-    28:28:boolean com.android.tools.r8.shaking.ClassInitFieldSynthesizer.isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):110 -> a
-    28:28:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):57 -> a
-    29:29:boolean com.android.tools.r8.graph.DexEncodedField.isProtected():250:250 -> a
-    29:29:boolean com.android.tools.r8.shaking.ClassInitFieldSynthesizer.isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):110 -> a
-    29:29:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):57 -> a
-    30:30:boolean com.android.tools.r8.graph.DexEncodedField.isProtected():250:250 -> a
-    30:30:boolean com.android.tools.r8.shaking.ClassInitFieldSynthesizer.isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):108 -> a
-    30:30:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):57 -> a
-    31:67:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):62:98 -> a
-com.android.tools.r8.shaking.ClassInitFieldSynthesizer$1 -> com.android.tools.r8.internal.lG0:
+    1:1:void <clinit>():24:24 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):30:30 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.AppView):28:32 -> <init>
+    1:3:void run(java.util.concurrent.ExecutorService):36:36 -> a
+    5:5:void run(java.util.concurrent.ExecutorService):38:38 -> a
+    6:15:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):42:51 -> a
+    16:27:boolean com.android.tools.r8.shaking.ClassInitFieldSynthesizer.isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):99:110 -> a
+    16:27:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):55 -> a
+    28:28:boolean com.android.tools.r8.graph.DexEncodedField.isPackagePrivate():212:212 -> a
+    28:28:boolean com.android.tools.r8.shaking.ClassInitFieldSynthesizer.isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):106 -> a
+    28:28:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):55 -> a
+    29:29:boolean com.android.tools.r8.graph.DexEncodedField.isProtected():216:216 -> a
+    29:29:boolean com.android.tools.r8.shaking.ClassInitFieldSynthesizer.isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):106 -> a
+    29:29:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):55 -> a
+    30:30:boolean com.android.tools.r8.graph.DexEncodedField.isProtected():216:216 -> a
+    30:30:boolean com.android.tools.r8.shaking.ClassInitFieldSynthesizer.isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):104 -> a
+    30:30:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):55 -> a
+    31:59:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):60:88 -> a
+    60:69:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):85:94 -> a
+com.android.tools.r8.shaking.ClassInitFieldSynthesizer$1 -> com.android.tools.r8.internal.oG0:
     int[] $SwitchMap$com$android$tools$r8$utils$Visibility -> a
-    1:1:void <clinit>():106:106 -> <clinit>
+    1:1:void <clinit>():102:102 -> <clinit>
 com.android.tools.r8.shaking.ClassInlineRule -> com.android.tools.r8.shaking.m:
     com.android.tools.r8.shaking.ClassInlineRule$Type type -> r
     int $r8$clinit -> s
@@ -119972,12 +120226,12 @@ com.android.tools.r8.shaking.ClassInlineRule$Builder -> com.android.tools.r8.sha
     1:1:void <init>(com.android.tools.r8.shaking.ClassInlineRule$1):18:18 -> <init>
     2:2:void <init>():21:21 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.ClassInlineRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.BG0:
+com.android.tools.r8.shaking.ClassInlineRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.EG0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.shaking.CollectingGraphConsumer -> com.android.tools.r8.internal.rI0:
+com.android.tools.r8.shaking.CollectingGraphConsumer -> com.android.tools.r8.internal.uI0:
     java.util.Map target2sources -> b
     com.android.tools.r8.experimental.graphinfo.GraphConsumer subConsumer -> a
     1:1:void <init>(com.android.tools.r8.experimental.graphinfo.GraphConsumer):23:23 -> <init>
@@ -119998,41 +120252,41 @@ com.android.tools.r8.shaking.ConstantArgumentRule$Builder -> com.android.tools.r
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
 com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry -> com.android.tools.r8.shaking.q:
-    com.android.tools.r8.utils.AndroidApiLevel maxApiReferenceLevel -> g
-    com.android.tools.r8.graph.AppView appView -> c
-    com.android.tools.r8.shaking.Enqueuer enqueuer -> e
-    java.util.function.BiFunction apiReferenceMapping -> f
-    com.android.tools.r8.graph.ProgramMethod context -> d
+    com.android.tools.r8.graph.ProgramMethod context -> e
+    com.android.tools.r8.shaking.Enqueuer enqueuer -> f
+    com.android.tools.r8.graph.AppView appView -> d
+    com.android.tools.r8.utils.AndroidApiLevel maxApiReferenceLevel -> h
+    java.util.function.BiFunction apiReferenceMapping -> g
     1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer,java.util.function.BiFunction):37:42 -> <init>
-    1:1:com.android.tools.r8.graph.DexProgramClass getContextHolder():50:50 -> a
-    2:3:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):70:71 -> a
-    4:5:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):94:95 -> a
-    6:6:void registerConstClass(com.android.tools.r8.graph.DexType,java.util.ListIterator):149:149 -> a
-    7:7:void registerCheckCast(com.android.tools.r8.graph.DexType):154:154 -> a
-    8:9:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):179:180 -> a
-    10:11:void registerCallSite(com.android.tools.r8.graph.DexCallSite):185:186 -> a
-    12:17:void setMaxApiReferenceLevel(com.android.tools.r8.graph.DexReference):190:195 -> a
-    18:23:void setMaxApiReferenceLevel(com.android.tools.r8.graph.DexReference):192:197 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getContextMethod():54:54 -> b
-    2:3:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):82:83 -> b
-    4:5:void registerInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):100:101 -> b
-    6:6:void registerExceptionGuard(com.android.tools.r8.graph.DexType):174:174 -> b
-    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):59:59 -> c
-    2:3:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):76:77 -> c
-    4:5:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):106:107 -> c
-    6:6:com.android.tools.r8.utils.AndroidApiLevel getMaxApiReferenceLevel():201:201 -> c
-    1:2:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):88:89 -> d
-    3:4:void registerInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):112:113 -> d
-    5:5:void registerInstanceOf(com.android.tools.r8.graph.DexType):169:169 -> d
+    1:2:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):70:71 -> a
+    3:4:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):94:95 -> a
+    5:5:void registerConstClass(com.android.tools.r8.graph.DexType,java.util.ListIterator):149:149 -> a
+    6:6:void registerCheckCast(com.android.tools.r8.graph.DexType):154:154 -> a
+    7:8:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):179:180 -> a
+    9:10:void registerCallSite(com.android.tools.r8.graph.DexCallSite):185:186 -> a
+    11:16:void setMaxApiReferenceLevel(com.android.tools.r8.graph.DexReference):190:195 -> a
+    17:22:void setMaxApiReferenceLevel(com.android.tools.r8.graph.DexReference):192:197 -> a
+    1:2:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):82:83 -> b
+    3:4:void registerInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):100:101 -> b
+    5:5:void registerExceptionGuard(com.android.tools.r8.graph.DexType):174:174 -> b
+    1:1:com.android.tools.r8.graph.DexProgramClass getContextHolder():50:50 -> c
+    2:2:void registerInitClass(com.android.tools.r8.graph.DexType):59:59 -> c
+    3:4:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):76:77 -> c
+    5:6:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):106:107 -> c
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getContextMethod():54:54 -> d
+    2:3:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):88:89 -> d
+    4:5:void registerInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):112:113 -> d
+    6:6:void registerInstanceOf(com.android.tools.r8.graph.DexType):169:169 -> d
     1:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):64:65 -> e
     3:4:void registerNewInstance(com.android.tools.r8.graph.DexType):118:119 -> e
     5:6:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):124:125 -> e
+    7:7:com.android.tools.r8.utils.AndroidApiLevel getMaxApiReferenceLevel():201:201 -> e
     1:2:void registerStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):130:131 -> f
     3:3:void registerSafeCheckCast(com.android.tools.r8.graph.DexType):159:159 -> f
     1:2:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):136:137 -> g
     3:3:void registerTypeReference(com.android.tools.r8.graph.DexType):164:164 -> g
     1:2:void registerStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):142:143 -> h
-com.android.tools.r8.shaking.DefaultTreePrunerConfiguration -> com.android.tools.r8.internal.AK0:
+com.android.tools.r8.shaking.DefaultTreePrunerConfiguration -> com.android.tools.r8.internal.DK0:
     com.android.tools.r8.shaking.DefaultTreePrunerConfiguration INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -120048,7 +120302,7 @@ com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBr
     1:1:java.util.function.Consumer getAction():42:42 -> a
     1:1:com.android.tools.r8.graph.ProgramMethod getMethodToKeep():34:34 -> b
     1:1:com.android.tools.r8.graph.ProgramMethod getSingleTarget():38:38 -> c
-com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection -> com.android.tools.r8.internal.DK0:
+com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection -> com.android.tools.r8.internal.GK0:
     java.util.Map dependentMinimumKeepInfo -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():29:29 -> <clinit>
@@ -120093,7 +120347,7 @@ com.android.tools.r8.shaking.DexStringCache -> com.android.tools.r8.shaking.s:
     java.util.concurrent.ConcurrentHashMap stringCache -> a
     1:2:void <init>():9:10 -> <init>
     1:1:java.lang.String lookupString(com.android.tools.r8.graph.DexString):13:13 -> a
-com.android.tools.r8.shaking.DiscardedChecker -> com.android.tools.r8.internal.CM0:
+com.android.tools.r8.shaking.DiscardedChecker -> com.android.tools.r8.internal.FM0:
     java.util.Set checkDiscarded -> a
     java.lang.Iterable classes -> b
     1:3:void <init>(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.lang.Iterable):20:22 -> <init>
@@ -120171,1258 +120425,1264 @@ com.android.tools.r8.shaking.Enqueuer -> com.android.tools.r8.shaking.y:
     java.util.Set virtualMethodsTargetedByInvokeDirect -> Q
     java.util.Set failedMethodResolutionTargets -> M
     com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet liveMethods -> R
-    1:1:void <clinit>():184:184 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):452:452 -> <init>
-    2:3770:void <init>(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):234:4002 -> <init>
-    3771:3817:void <init>(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):453:499 -> <init>
+    1:1:void <clinit>():186:186 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):454:454 -> <init>
+    2:3782:void <init>(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):236:4016 -> <init>
+    3783:3829:void <init>(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):455:501 -> <init>
     com.android.tools.r8.shaking.KeepReason lambda$keepClassAndAllMembers$40(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness) -> a
-    com.android.tools.r8.graph.DexApplication lambda$postProcessingDesugaring$91(com.android.tools.r8.graph.DexApplication) -> a
-    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy access$1000(com.android.tools.r8.shaking.Enqueuer):184:184 -> a
-    2:2:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):184:184 -> a
-    3:3:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):184:184 -> a
-    4:4:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):633:633 -> a
-    4:4:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):184 -> a
+    com.android.tools.r8.graph.DexApplication lambda$postProcessingDesugaring$92(com.android.tools.r8.graph.DexApplication) -> a
+    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy access$1000(com.android.tools.r8.shaking.Enqueuer):186:186 -> a
+    2:2:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):186:186 -> a
+    3:3:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):186:186 -> a
+    4:4:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):635:635 -> a
+    4:4:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):186 -> a
     5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> a
-    5:5:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):634 -> a
-    5:5:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):184 -> a
-    6:6:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):634:634 -> a
-    6:6:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):184 -> a
-    7:7:com.android.tools.r8.graph.DexProgramClass access$1800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):184:184 -> a
-    8:8:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):747:747 -> a
-    8:8:com.android.tools.r8.graph.DexProgramClass access$1800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):184 -> a
-    9:9:void access$2000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):184:184 -> a
-    10:10:void access$2200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):184:184 -> a
-    11:11:void access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext):184:184 -> a
-    12:12:void access$2400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):184:184 -> a
-    13:13:void access$2500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):184:184 -> a
+    5:5:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):636 -> a
+    5:5:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):186 -> a
+    6:6:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):636:636 -> a
+    6:6:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):186 -> a
+    7:7:com.android.tools.r8.graph.DexProgramClass access$1800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):186:186 -> a
+    8:8:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):749:749 -> a
+    8:8:com.android.tools.r8.graph.DexProgramClass access$1800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):186 -> a
+    9:9:void access$2000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):186:186 -> a
+    10:10:void access$2200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):186:186 -> a
+    11:11:void access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext):186:186 -> a
+    12:12:void access$2400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):186:186 -> a
+    13:13:void access$2500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):186:186 -> a
     14:14:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():293:293 -> a
-    14:14:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1196 -> a
-    15:17:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1196:1198 -> a
+    14:14:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1198 -> a
+    15:17:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1198:1200 -> a
     18:18:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.methodHandleReferencedIn(com.android.tools.r8.graph.ProgramMethod):87:87 -> a
-    18:18:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1200 -> a
+    18:18:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1202 -> a
     19:19:boolean com.android.tools.r8.graph.DexClass.isAnnotation():651:651 -> a
-    19:19:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1201 -> a
-    20:24:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1202:1206 -> a
-    25:25:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):477:477 -> a
-    26:26:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):527:527 -> a
-    26:26:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):477 -> a
-    27:27:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():503:503 -> a
-    28:28:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory lambda$createUseRegistryFactory$1(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):517:517 -> a
-    29:29:com.android.tools.r8.shaking.Enqueuer registerCheckCastAnalysis(com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):542:542 -> a
-    30:30:void setAnnotationRemoverBuilder(com.android.tools.r8.shaking.AnnotationRemover$Builder):552:552 -> a
-    31:31:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):566:566 -> a
+    19:19:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1203 -> a
+    20:24:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1204:1208 -> a
+    25:25:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):479:479 -> a
+    26:26:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):529:529 -> a
+    26:26:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):479 -> a
+    27:27:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():505:505 -> a
+    28:28:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory lambda$createUseRegistryFactory$1(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):519:519 -> a
+    29:29:com.android.tools.r8.shaking.Enqueuer registerCheckCastAnalysis(com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):544:544 -> a
+    30:30:void setAnnotationRemoverBuilder(com.android.tools.r8.shaking.AnnotationRemover$Builder):554:554 -> a
+    31:31:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):568:568 -> a
     32:33:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):355:356 -> a
-    32:33:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):566 -> a
-    34:35:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):566:567 -> a
-    36:36:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):571:571 -> a
-    36:36:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):567 -> a
-    37:37:boolean addLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):575:575 -> a
-    38:38:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext):618:618 -> a
-    39:42:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):625:628 -> a
-    43:43:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):633:633 -> a
+    32:33:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):568 -> a
+    34:35:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):568:569 -> a
+    36:36:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):573:573 -> a
+    36:36:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):569 -> a
+    37:37:boolean addLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):577:577 -> a
+    38:38:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext):620:620 -> a
+    39:42:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):627:630 -> a
+    43:43:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):635:635 -> a
     44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> a
-    44:44:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):634 -> a
-    45:45:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):634:634 -> a
-    46:46:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):646:646 -> a
-    47:47:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):653:653 -> a
-    47:47:com.android.tools.r8.graph.DexClass access$2600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):184 -> a
-    48:48:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):653:653 -> a
-    49:49:void lambda$internalDefinitionFor$2(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):669:669 -> a
-    50:56:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2293:2293 -> a
-    50:56:void lambda$internalDefinitionFor$2(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):669 -> a
-    62:75:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2299:2312 -> a
-    62:75:void lambda$internalDefinitionFor$2(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):669 -> a
+    44:44:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):636 -> a
+    45:45:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):636:636 -> a
+    46:46:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):648:648 -> a
+    47:47:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):655:655 -> a
+    47:47:com.android.tools.r8.graph.DexClass access$2600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):186 -> a
+    48:48:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):655:655 -> a
+    49:49:void lambda$internalDefinitionFor$2(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):671:671 -> a
+    50:56:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2295:2295 -> a
+    50:56:void lambda$internalDefinitionFor$2(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):671 -> a
+    62:75:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2301:2314 -> a
+    62:75:void lambda$internalDefinitionFor$2(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):671 -> a
     76:76:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):298:298 -> a
-    76:76:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2312 -> a
-    76:76:void lambda$internalDefinitionFor$2(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):669 -> a
-    77:79:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2313:2315 -> a
-    77:79:void lambda$internalDefinitionFor$2(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):669 -> a
-    80:80:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):693:693 -> a
+    76:76:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2314 -> a
+    76:76:void lambda$internalDefinitionFor$2(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):671 -> a
+    77:79:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2315:2317 -> a
+    77:79:void lambda$internalDefinitionFor$2(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):671 -> a
+    80:80:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):695:695 -> a
     81:81:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    81:81:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):693 -> a
-    82:84:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):695:697 -> a
-    85:89:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):758:762 -> a
-    85:89:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):697 -> a
-    90:90:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):699:699 -> a
+    81:81:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):695 -> a
+    82:84:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):697:699 -> a
+    85:89:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):760:764 -> a
+    85:89:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):699 -> a
+    90:90:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):701:701 -> a
     91:91:void com.android.tools.r8.graph.DexClass.forEachClassField(java.util.function.Consumer):144:144 -> a
-    91:91:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):699 -> a
-    92:92:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):706:706 -> a
+    91:91:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):701 -> a
+    92:92:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):708:708 -> a
     93:93:void com.android.tools.r8.graph.DexClass.forEachClassMethod(java.util.function.Consumer):154:154 -> a
-    93:93:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):706 -> a
-    94:95:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):715:716 -> a
-    96:97:void lambda$processNewLiveNonProgramType$3(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndField):702:703 -> a
-    98:98:void lambda$processNewLiveNonProgramType$3(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndField):701:701 -> a
-    99:101:void lambda$processNewLiveNonProgramType$4(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):708:710 -> a
-    102:105:void lambda$processNewLiveNonProgramType$4(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):709:712 -> a
-    106:116:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):726:736 -> a
-    117:117:void lambda$enqueueAllIfNotShrinking$5(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):816:816 -> a
-    118:118:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):818:818 -> a
-    119:119:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):826:826 -> a
-    120:120:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():440:440 -> a
-    120:120:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):826 -> a
-    121:121:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):826:826 -> a
-    122:122:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():432:432 -> a
-    122:122:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):827 -> a
-    123:124:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):827:828 -> a
-    125:125:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():432:432 -> a
-    125:125:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):829 -> a
-    126:126:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):829:829 -> a
-    127:127:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):834:834 -> a
+    93:93:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):708 -> a
+    94:95:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):717:718 -> a
+    96:97:void lambda$processNewLiveNonProgramType$3(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndField):704:705 -> a
+    98:98:void lambda$processNewLiveNonProgramType$3(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndField):703:703 -> a
+    99:101:void lambda$processNewLiveNonProgramType$4(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):710:712 -> a
+    102:105:void lambda$processNewLiveNonProgramType$4(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):711:714 -> a
+    106:116:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):728:738 -> a
+    117:117:void lambda$enqueueAllIfNotShrinking$5(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):818:818 -> a
+    118:118:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):820:820 -> a
+    119:119:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):828:828 -> a
+    120:120:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():444:444 -> a
+    120:120:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):828 -> a
+    121:121:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):828:828 -> a
+    122:122:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():436:436 -> a
+    122:122:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):829 -> a
+    123:124:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):829:830 -> a
+    125:125:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():436:436 -> a
+    125:125:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):831 -> a
+    126:126:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):831:831 -> a
+    127:127:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):836:836 -> a
     128:128:boolean com.android.tools.r8.graph.DexClass.isAnnotation():651:651 -> a
-    128:128:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):835 -> a
-    129:139:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):836:846 -> a
-    140:144:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):844:848 -> a
+    128:128:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):837 -> a
+    129:139:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):838:848 -> a
+    140:144:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):846:850 -> a
     145:145:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):831:831 -> a
-    145:145:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):848 -> a
+    145:145:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):850 -> a
     146:146:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isExternalizable(com.android.tools.r8.graph.DexType):382:382 -> a
     146:146:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):831 -> a
-    146:146:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):848 -> a
-    147:147:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):849:849 -> a
-    148:148:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):857:857 -> a
-    149:149:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():440:440 -> a
-    149:149:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):857 -> a
-    150:150:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):857:857 -> a
-    151:151:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():432:432 -> a
-    151:151:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):858 -> a
-    152:154:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):858:860 -> a
-    155:155:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():432:432 -> a
-    155:155:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):863 -> a
-    156:156:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):863:863 -> a
-    157:157:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):862:862 -> a
-    158:158:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):860:860 -> a
-    159:159:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):870:870 -> a
-    160:160:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():440:440 -> a
-    160:160:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):870 -> a
-    161:161:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):870:870 -> a
-    162:162:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():432:432 -> a
-    162:162:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):871 -> a
-    163:165:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):871:873 -> a
-    166:166:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():432:432 -> a
-    166:166:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):876 -> a
-    167:167:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):876:876 -> a
-    168:168:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):875:875 -> a
-    169:169:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):873:873 -> a
-    170:173:boolean registerMethodWithTargetAndContext(java.util.function.BiPredicate,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):912:915 -> a
-    174:174:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):921:921 -> a
-    174:174:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1424 -> a
-    175:201:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1428:1454 -> a
+    146:146:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):850 -> a
+    147:147:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):851:851 -> a
+    148:148:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):859:859 -> a
+    149:149:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():444:444 -> a
+    149:149:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):859 -> a
+    150:150:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):859:859 -> a
+    151:151:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():436:436 -> a
+    151:151:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):860 -> a
+    152:154:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):860:862 -> a
+    155:155:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():436:436 -> a
+    155:155:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):865 -> a
+    156:156:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):865:865 -> a
+    157:157:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):864:864 -> a
+    158:158:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):862:862 -> a
+    159:159:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):872:872 -> a
+    160:160:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():444:444 -> a
+    160:160:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):872 -> a
+    161:161:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):872:872 -> a
+    162:162:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():436:436 -> a
+    162:162:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):873 -> a
+    163:165:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):873:875 -> a
+    166:166:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():436:436 -> a
+    166:166:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):878 -> a
+    167:167:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):878:878 -> a
+    168:168:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):877:877 -> a
+    169:169:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):875:875 -> a
+    170:173:boolean registerMethodWithTargetAndContext(java.util.function.BiPredicate,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):914:917 -> a
+    174:174:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):923:923 -> a
+    174:174:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1426 -> a
+    175:201:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1430:1456 -> a
     202:202:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    202:202:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1454 -> a
-    203:205:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1457:1459 -> a
-    206:208:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1714:1716 -> a
-    206:208:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1459 -> a
-    209:209:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1462:1462 -> a
+    202:202:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1456 -> a
+    203:205:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1459:1461 -> a
+    206:208:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1716:1718 -> a
+    206:208:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1461 -> a
+    209:209:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1464:1464 -> a
     210:210:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> a
-    210:210:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1463 -> a
-    211:211:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1462:1462 -> a
-    212:213:boolean registerReflectiveFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):937:938 -> a
-    214:245:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):944:975 -> a
-    246:246:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):981:981 -> a
-    247:247:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    247:247:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):981 -> a
-    248:250:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):981:983 -> a
-    251:251:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):747:747 -> a
-    251:251:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):983 -> a
-    252:261:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):985:994 -> a
-    262:262:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2390:2390 -> a
-    262:262:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):996 -> a
-    263:281:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2397:2415 -> a
-    263:281:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2391 -> a
-    263:281:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):996 -> a
-    282:282:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2392:2392 -> a
-    282:282:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):996 -> a
+    210:210:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1465 -> a
+    211:211:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1464:1464 -> a
+    212:213:boolean registerReflectiveFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):939:940 -> a
+    214:245:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):946:977 -> a
+    246:246:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):983:983 -> a
+    247:247:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    247:247:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):983 -> a
+    248:250:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):983:985 -> a
+    251:251:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):749:749 -> a
+    251:251:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):985 -> a
+    252:261:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):987:996 -> a
+    262:262:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2392:2392 -> a
+    262:262:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):998 -> a
+    263:281:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2399:2417 -> a
+    263:281:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2393 -> a
+    263:281:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):998 -> a
+    282:282:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2394:2394 -> a
+    282:282:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):998 -> a
     283:283:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.ir.desugar.LambdaDescriptor):17:17 -> a
-    283:283:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2422 -> a
-    283:283:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):997 -> a
-    284:284:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2422:2422 -> a
-    284:284:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):997 -> a
-    285:285:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2421:2421 -> a
-    285:285:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):997 -> a
-    286:316:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):998:1028 -> a
+    283:283:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2424 -> a
+    283:283:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):999 -> a
+    284:284:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2424:2424 -> a
+    284:284:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):999 -> a
+    285:285:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2423:2423 -> a
+    285:285:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):999 -> a
+    286:316:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1000:1030 -> a
     317:317:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-    317:317:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1277 -> a
-    317:317:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1016 -> a
-    318:318:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1277:1277 -> a
-    318:318:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1016 -> a
+    317:317:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1279 -> a
+    317:317:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1018 -> a
+    318:318:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1279:1279 -> a
+    318:318:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1018 -> a
     319:319:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-    319:319:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1256 -> a
-    319:319:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1022 -> a
-    320:320:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1256:1256 -> a
-    320:320:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1022 -> a
-    321:321:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025:1025 -> a
-    322:322:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1395:1395 -> a
-    322:322:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025 -> a
+    319:319:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1258 -> a
+    319:319:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1024 -> a
+    320:320:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1258:1258 -> a
+    320:320:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1024 -> a
+    321:321:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1027:1027 -> a
+    322:322:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1397:1397 -> a
+    322:322:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1027 -> a
     323:323:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-    323:323:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1396 -> a
-    323:323:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025 -> a
-    324:324:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1395:1395 -> a
-    324:324:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025 -> a
+    323:323:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1398 -> a
+    323:323:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1027 -> a
+    324:324:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1397:1397 -> a
+    324:324:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1027 -> a
     325:325:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-    325:325:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1353 -> a
-    325:325:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1019 -> a
-    326:326:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1353:1353 -> a
-    326:326:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1019 -> a
+    325:325:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1355 -> a
+    325:325:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1021 -> a
+    326:326:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1355:1355 -> a
+    326:326:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1021 -> a
     327:327:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-    327:327:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1298 -> a
-    327:327:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1013 -> a
-    328:328:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1298:1298 -> a
-    328:328:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1013 -> a
-    329:329:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$traceCallSite$7(com.android.tools.r8.graph.DexCallSite):998:998 -> a
-    330:330:void lambda$traceCheckCast$8(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1033:1033 -> a
-    331:335:void handleLockCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1056:1060 -> a
-    331:335:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1046 -> a
-    336:336:void traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1102:1102 -> a
-    336:336:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1047 -> a
-    337:338:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1076:1077 -> a
+    327:327:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1300 -> a
+    327:327:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1015 -> a
+    328:328:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1300:1300 -> a
+    328:328:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1015 -> a
+    329:329:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$traceCallSite$7(com.android.tools.r8.graph.DexCallSite):1000:1000 -> a
+    330:330:void lambda$traceCheckCast$8(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1035:1035 -> a
+    331:335:void handleLockCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1058:1062 -> a
+    331:335:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1048 -> a
+    336:336:void traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1104:1104 -> a
+    336:336:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1049 -> a
+    337:338:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1078:1079 -> a
     339:341:java.lang.Object com.android.tools.r8.utils.IteratorUtils.nextUntil(java.util.Iterator,java.util.function.Predicate):82:84 -> a
-    339:341:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1078 -> a
-    342:352:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1078:1088 -> a
+    339:341:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1080 -> a
+    342:352:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1080:1090 -> a
     353:353:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1538:1538 -> a
-    353:353:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1089 -> a
-    354:361:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1089:1096 -> a
-    362:362:boolean lambda$isConstClassMaybeUsedAsLock$10(com.android.tools.r8.code.CfOrDexInstruction):1081:1081 -> a
+    353:353:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1091 -> a
+    354:361:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1091:1098 -> a
+    362:362:boolean lambda$isConstClassMaybeUsedAsLock$10(com.android.tools.r8.code.CfOrDexInstruction):1083:1083 -> a
     363:363:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    363:363:boolean lambda$isConstClassMaybeUsedAsLock$10(com.android.tools.r8.code.CfOrDexInstruction):1081 -> a
-    364:364:boolean lambda$isConstClassMaybeUsedAsLock$10(com.android.tools.r8.code.CfOrDexInstruction):1082:1082 -> a
+    363:363:boolean lambda$isConstClassMaybeUsedAsLock$10(com.android.tools.r8.code.CfOrDexInstruction):1083 -> a
+    364:364:boolean lambda$isConstClassMaybeUsedAsLock$10(com.android.tools.r8.code.CfOrDexInstruction):1084:1084 -> a
     365:365:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    365:365:boolean lambda$isConstClassMaybeUsedAsLock$10(com.android.tools.r8.code.CfOrDexInstruction):1082 -> a
-    366:366:com.android.tools.r8.shaking.KeepReason lambda$internalTraceConstClassOrCheckCast$11(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):1125:1125 -> a
-    367:373:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1179:1185 -> a
-    374:374:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1214:1214 -> a
-    374:374:void internalTraceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1115 -> a
-    375:383:void internalTraceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1116:1124 -> a
-    384:384:void lambda$traceInvokeDirect$14(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1232:1232 -> a
-    385:391:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1244:1250 -> a
-    392:392:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1246:1246 -> a
-    393:393:java.lang.Boolean lambda$registerDeferredActionForDeadProtoBuilder$16(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):1248:1248 -> a
-    394:394:boolean lambda$registerDeferredActionForDeadProtoBuilder$15(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):1249:1249 -> a
-    395:400:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1261:1266 -> a
+    365:365:boolean lambda$isConstClassMaybeUsedAsLock$10(com.android.tools.r8.code.CfOrDexInstruction):1084 -> a
+    366:366:com.android.tools.r8.shaking.KeepReason lambda$internalTraceConstClassOrCheckCast$11(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):1127:1127 -> a
+    367:373:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1181:1187 -> a
+    374:374:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1216:1216 -> a
+    374:374:void internalTraceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1117 -> a
+    375:383:void internalTraceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1118:1126 -> a
+    384:384:void lambda$traceInvokeDirect$14(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1234:1234 -> a
+    385:391:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1246:1252 -> a
+    392:392:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1248:1248 -> a
+    393:393:java.lang.Boolean lambda$registerDeferredActionForDeadProtoBuilder$16(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):1250:1250 -> a
+    394:394:boolean lambda$registerDeferredActionForDeadProtoBuilder$15(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):1251:1251 -> a
+    395:400:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1263:1268 -> a
     401:401:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    401:401:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1266 -> a
-    402:403:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1268:1269 -> a
-    404:404:void lambda$traceInvokeDirect$17(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1269:1269 -> a
-    405:405:void lambda$traceNewInstance$22(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1381:1381 -> a
-    406:406:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1404:1404 -> a
+    401:401:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1268 -> a
+    402:403:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1270:1271 -> a
+    404:404:void lambda$traceInvokeDirect$17(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1271:1271 -> a
+    405:405:void lambda$traceNewInstance$22(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1383:1383 -> a
+    406:406:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1406:1406 -> a
     407:407:boolean com.android.tools.r8.graph.DexClass.isAnnotation():651:651 -> a
-    407:407:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1406 -> a
-    408:411:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1406:1409 -> a
-    412:412:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1407:1407 -> a
-    413:413:void lambda$traceStaticFieldRead$23(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1541:1541 -> a
-    414:414:java.lang.Boolean lambda$traceStaticFieldRead$24(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1570:1570 -> a
-    415:427:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):1698:1710 -> a
-    428:428:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1721:1721 -> a
-    429:433:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1735:1739 -> a
-    434:434:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isFinalMainDexTracing():215:215 -> a
-    434:434:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1739 -> a
-    435:438:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1739:1739 -> a
-    441:443:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1742:1744 -> a
+    407:407:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1408 -> a
+    408:411:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1408:1411 -> a
+    412:412:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1409:1409 -> a
+    413:413:void lambda$traceStaticFieldRead$23(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1543:1543 -> a
+    414:414:java.lang.Boolean lambda$traceStaticFieldRead$24(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1572:1572 -> a
+    415:427:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):1700:1712 -> a
+    428:428:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1723:1723 -> a
+    429:433:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1737:1741 -> a
+    434:434:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isFinalMainDexTracing():217:217 -> a
+    434:434:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1741 -> a
+    435:438:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1741:1741 -> a
+    441:443:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1744:1746 -> a
     444:444:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap.isUnboxedEnum(com.android.tools.r8.graph.DexProgramClass):28:28 -> a
-    444:444:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1744 -> a
-    445:485:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1744:1784 -> a
+    444:444:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1746 -> a
+    445:485:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1746:1786 -> a
     486:486:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    486:486:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1784 -> a
-    487:498:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1787:1798 -> a
-    499:507:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):767:775 -> a
-    499:507:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1802 -> a
-    508:525:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):770:787 -> a
-    508:525:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1802 -> a
-    526:526:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):782:782 -> a
-    526:526:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1802 -> a
-    527:546:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1806:1825 -> a
-    547:558:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):881:892 -> a
-    547:558:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1826 -> a
-    559:562:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1830:1833 -> a
+    486:486:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1786 -> a
+    487:498:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1789:1800 -> a
+    499:507:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):769:777 -> a
+    499:507:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1804 -> a
+    508:525:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):772:789 -> a
+    508:525:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1804 -> a
+    526:526:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):784:784 -> a
+    526:526:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1804 -> a
+    527:546:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1808:1827 -> a
+    547:558:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):883:894 -> a
+    547:558:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1828 -> a
+    559:562:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1832:1835 -> a
     563:563:boolean com.android.tools.r8.graph.DexClass.isAnnotation():651:651 -> a
-    563:563:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1836 -> a
-    564:570:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1837:1843 -> a
+    563:563:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1838 -> a
+    564:570:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1839:1845 -> a
     571:571:java.util.Set com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1549:1549 -> a
-    571:571:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1843 -> a
-    572:576:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):898:902 -> a
-    572:576:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1842 -> a
-    577:577:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1845:1845 -> a
-    578:578:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind lambda$markTypeAsLive$28(com.android.tools.r8.graph.ProgramDefinition):1839:1839 -> a
-    579:579:void lambda$markTypeAsLive$29(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1845:1845 -> a
-    580:583:void processDeferredAnnotations(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.function.Function):1853:1856 -> a
-    584:586:void processDeferredAnnotations(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.function.Function):1855:1857 -> a
-    587:587:boolean lambda$processDeferredAnnotations$30(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1856:1856 -> a
-    588:588:void lambda$processDeferredAnnotations$32(java.util.function.Function,com.android.tools.r8.graph.DexAnnotation,java.util.List):1859:1859 -> a
-    589:589:void lambda$processDeferredAnnotations$31(com.android.tools.r8.graph.DexAnnotation,java.util.function.Function,com.android.tools.r8.graph.ProgramDefinition):1862:1862 -> a
-    590:590:void lambda$processDeferredAnnotations$31(com.android.tools.r8.graph.DexAnnotation,java.util.function.Function,com.android.tools.r8.graph.ProgramDefinition):1861:1861 -> a
-    591:594:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1867:1870 -> a
-    595:597:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1869:1871 -> a
+    571:571:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1845 -> a
+    572:576:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):900:904 -> a
+    572:576:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1844 -> a
+    577:577:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1847:1847 -> a
+    578:578:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind lambda$markTypeAsLive$28(com.android.tools.r8.graph.ProgramDefinition):1841:1841 -> a
+    579:579:void lambda$markTypeAsLive$29(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1847:1847 -> a
+    580:583:void processDeferredAnnotations(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.function.Function):1855:1858 -> a
+    584:586:void processDeferredAnnotations(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.function.Function):1857:1859 -> a
+    587:587:boolean lambda$processDeferredAnnotations$30(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1858:1858 -> a
+    588:588:void lambda$processDeferredAnnotations$32(java.util.function.Function,com.android.tools.r8.graph.DexAnnotation,java.util.List):1861:1861 -> a
+    589:589:void lambda$processDeferredAnnotations$31(com.android.tools.r8.graph.DexAnnotation,java.util.function.Function,com.android.tools.r8.graph.ProgramDefinition):1864:1864 -> a
+    590:590:void lambda$processDeferredAnnotations$31(com.android.tools.r8.graph.DexAnnotation,java.util.function.Function,com.android.tools.r8.graph.ProgramDefinition):1863:1863 -> a
+    591:594:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1869:1872 -> a
+    595:597:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1871:1873 -> a
     598:598:void com.android.tools.r8.graph.MethodCollection.forEachVirtualMethod(java.util.function.Consumer):126:126 -> a
-    598:598:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1871 -> a
-    599:599:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1876:1876 -> a
-    600:602:boolean lambda$ensureMethodsContinueToWidenAccess$34(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1878:1880 -> a
+    598:598:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1873 -> a
+    599:599:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1878:1878 -> a
+    600:602:boolean lambda$ensureMethodsContinueToWidenAccess$34(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1880:1882 -> a
     603:608:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):449:454 -> a
-    603:608:boolean lambda$ensureMethodsContinueToWidenAccess$34(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1880 -> a
-    609:609:void lambda$ensureMethodsContinueToWidenAccess$35(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):1881:1881 -> a
-    610:613:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1961:1964 -> a
-    614:619:boolean shouldKeepAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,boolean):1994:1999 -> a
-    614:619:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1965 -> a
-    620:637:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1969:1986 -> a
-    638:638:java.util.List lambda$processAnnotation$38(com.android.tools.r8.graph.DexAnnotation):1973:1973 -> a
-    639:642:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2005:2008 -> a
-    643:647:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2007:2011 -> a
-    648:648:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):633:633 -> a
-    648:648:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2012 -> a
+    603:608:boolean lambda$ensureMethodsContinueToWidenAccess$34(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1882 -> a
+    609:609:void lambda$ensureMethodsContinueToWidenAccess$35(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):1883:1883 -> a
+    610:613:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1963:1966 -> a
+    614:619:boolean shouldKeepAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,boolean):1996:2001 -> a
+    614:619:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1967 -> a
+    620:637:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1971:1988 -> a
+    638:638:java.util.List lambda$processAnnotation$38(com.android.tools.r8.graph.DexAnnotation):1975:1975 -> a
+    639:642:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2007:2010 -> a
+    643:647:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2009:2013 -> a
+    648:648:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):635:635 -> a
+    648:648:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2014 -> a
     649:649:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> a
-    649:649:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):634 -> a
-    649:649:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2012 -> a
-    650:650:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):634:634 -> a
-    650:650:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2012 -> a
-    651:682:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2169:2200 -> a
-    683:707:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2205:2229 -> a
+    649:649:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):636 -> a
+    649:649:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2014 -> a
+    650:650:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):636:636 -> a
+    650:650:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2014 -> a
+    651:682:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2171:2202 -> a
+    683:707:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2207:2231 -> a
     708:708:boolean com.android.tools.r8.errors.dontwarn.DontWarnConfiguration.matches(com.android.tools.r8.graph.Definition):27:27 -> a
-    708:708:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2229 -> a
-    709:720:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2234:2245 -> a
-    721:723:void lambda$ensureFromLibraryOrThrow$39(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):2223:2225 -> a
-    724:726:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2257:2259 -> a
-    727:727:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2251:2251 -> a
-    727:727:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2260 -> a
-    728:728:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():595:595 -> a
-    728:728:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2251 -> a
-    728:728:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2260 -> a
-    729:729:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2252:2252 -> a
-    729:729:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2260 -> a
-    730:736:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2261:2267 -> a
-    737:737:void lambda$keepClassAndAllMembers$41(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2263:2263 -> a
-    738:738:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2251:2251 -> a
-    738:738:void lambda$keepClassAndAllMembers$41(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2264 -> a
-    739:739:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():595:595 -> a
-    739:739:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2251 -> a
-    739:739:void lambda$keepClassAndAllMembers$41(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2264 -> a
-    740:740:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2252:2252 -> a
-    740:740:void lambda$keepClassAndAllMembers$41(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2264 -> a
-    741:741:void lambda$keepClassAndAllMembers$41(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2265:2265 -> a
-    742:742:void lambda$keepClassAndAllMembers$42(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2269:2269 -> a
-    743:743:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2251:2251 -> a
-    743:743:void lambda$keepClassAndAllMembers$42(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2270 -> a
-    744:744:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():595:595 -> a
-    744:744:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2251 -> a
-    744:744:void lambda$keepClassAndAllMembers$42(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2270 -> a
-    745:745:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2252:2252 -> a
-    745:745:void lambda$keepClassAndAllMembers$42(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2270 -> a
-    746:746:void lambda$keepClassAndAllMembers$42(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2271:2271 -> a
-    747:747:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2276:2276 -> a
-    747:747:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2280 -> a
-    747:747:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):184 -> a
-    748:748:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2276:2276 -> a
-    748:748:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2280 -> a
-    749:749:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2276:2276 -> a
-    749:749:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType):2284 -> a
-    749:749:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2289 -> a
-    750:750:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2329:2329 -> a
+    708:708:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2231 -> a
+    709:720:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2236:2247 -> a
+    721:723:void lambda$ensureFromLibraryOrThrow$39(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):2225:2227 -> a
+    724:726:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2259:2261 -> a
+    727:727:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2253:2253 -> a
+    727:727:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2262 -> a
+    728:728:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():601:601 -> a
+    728:728:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2253 -> a
+    728:728:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2262 -> a
+    729:729:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2254:2254 -> a
+    729:729:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2262 -> a
+    730:736:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2263:2269 -> a
+    737:737:void lambda$keepClassAndAllMembers$41(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2265:2265 -> a
+    738:738:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2253:2253 -> a
+    738:738:void lambda$keepClassAndAllMembers$41(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2266 -> a
+    739:739:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():601:601 -> a
+    739:739:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2253 -> a
+    739:739:void lambda$keepClassAndAllMembers$41(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2266 -> a
+    740:740:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2254:2254 -> a
+    740:740:void lambda$keepClassAndAllMembers$41(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2266 -> a
+    741:741:void lambda$keepClassAndAllMembers$41(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2267:2267 -> a
+    742:742:void lambda$keepClassAndAllMembers$42(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2271:2271 -> a
+    743:743:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2253:2253 -> a
+    743:743:void lambda$keepClassAndAllMembers$42(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2272 -> a
+    744:744:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():601:601 -> a
+    744:744:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2253 -> a
+    744:744:void lambda$keepClassAndAllMembers$42(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2272 -> a
+    745:745:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2254:2254 -> a
+    745:745:void lambda$keepClassAndAllMembers$42(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2272 -> a
+    746:746:void lambda$keepClassAndAllMembers$42(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2273:2273 -> a
+    747:747:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2278:2278 -> a
+    747:747:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2282 -> a
+    747:747:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):186 -> a
+    748:748:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2278:2278 -> a
+    748:748:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2282 -> a
+    749:749:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2278:2278 -> a
+    749:749:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType):2286 -> a
+    749:749:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2291 -> a
+    750:750:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2331:2331 -> a
     751:751:boolean com.android.tools.r8.graph.DexClass.isAnnotation():651:651 -> a
-    751:751:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2329 -> a
-    752:758:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2329:2335 -> a
-    759:760:boolean markInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2364:2365 -> a
-    759:760:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2338 -> a
-    761:762:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2342:2343 -> a
+    751:751:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2331 -> a
+    752:758:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2331:2337 -> a
+    759:760:boolean markInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2366:2367 -> a
+    759:760:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2340 -> a
+    761:762:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2344:2345 -> a
     763:763:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    763:763:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2343 -> a
-    764:766:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2346:2348 -> a
+    763:763:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2345 -> a
+    764:766:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2348:2350 -> a
     767:767:boolean com.android.tools.r8.graph.DexClass.isAnnotation():651:651 -> a
-    767:767:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2426 -> a
-    767:767:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2351 -> a
-    768:769:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2426:2427 -> a
-    768:769:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2351 -> a
+    767:767:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2428 -> a
+    767:767:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2353 -> a
+    768:769:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2428:2429 -> a
+    768:769:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2353 -> a
     770:770:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.graph.DexProgramClass):13:13 -> a
-    770:770:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2429 -> a
-    770:770:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2351 -> a
-    771:771:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2429:2429 -> a
-    771:771:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2351 -> a
-    772:772:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2428:2428 -> a
-    772:772:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2351 -> a
-    773:782:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2593:2602 -> a
-    773:782:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2353 -> a
-    783:783:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2606:2606 -> a
-    783:783:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2355 -> a
+    770:770:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2431 -> a
+    770:770:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2353 -> a
+    771:771:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2431:2431 -> a
+    771:771:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2353 -> a
+    772:772:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2430:2430 -> a
+    772:772:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2353 -> a
+    773:782:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2595:2604 -> a
+    773:782:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2355 -> a
+    783:783:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2608:2608 -> a
+    783:783:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2357 -> a
     784:784:boolean com.android.tools.r8.graph.DexClass.isAnnotation():651:651 -> a
-    784:784:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2606 -> a
-    784:784:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2355 -> a
-    785:787:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2606:2608 -> a
-    785:787:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2355 -> a
-    788:788:void lambda$processNewlyInstantiatedClass$43(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2336:2336 -> a
-    789:789:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2370:2370 -> a
+    784:784:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2608 -> a
+    784:784:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2357 -> a
+    785:787:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2608:2610 -> a
+    785:787:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2357 -> a
+    788:788:void lambda$processNewlyInstantiatedClass$43(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2338:2338 -> a
+    789:789:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2372:2372 -> a
     790:790:boolean com.android.tools.r8.graph.DexClass.isAnnotation():651:651 -> a
-    790:790:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2370 -> a
-    791:795:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2370:2374 -> a
-    796:797:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2612:2613 -> a
-    796:797:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2375 -> a
-    798:806:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2441:2449 -> a
-    807:821:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2505:2519 -> a
-    807:821:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2451 -> a
-    822:822:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2516:2516 -> a
-    822:822:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2451 -> a
+    790:790:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2372 -> a
+    791:795:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2372:2376 -> a
+    796:797:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2614:2615 -> a
+    796:797:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2377 -> a
+    798:806:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2443:2451 -> a
+    807:821:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2507:2521 -> a
+    807:821:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2453 -> a
+    822:822:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2518:2518 -> a
+    822:822:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2453 -> a
     823:823:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
-    823:823:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2526 -> a
-    823:823:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2451 -> a
-    824:826:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2526:2528 -> a
-    824:826:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2451 -> a
-    827:831:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2527:2531 -> a
-    827:831:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2451 -> a
-    832:838:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2530:2536 -> a
-    832:838:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2451 -> a
-    839:839:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2533:2533 -> a
-    839:839:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2451 -> a
-    840:843:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2453:2456 -> a
-    844:844:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2467:2467 -> a
+    823:823:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2528 -> a
+    823:823:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2453 -> a
+    824:826:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2528:2530 -> a
+    824:826:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2453 -> a
+    827:831:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2529:2533 -> a
+    827:831:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2453 -> a
+    832:838:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2532:2538 -> a
+    832:838:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2453 -> a
+    839:839:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2535:2535 -> a
+    839:839:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2453 -> a
+    840:843:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2455:2458 -> a
+    844:844:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2469:2469 -> a
     845:845:boolean com.android.tools.r8.shaking.InstantiatedObject.isLambda():0:0 -> a
-    845:845:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2467 -> a
-    846:848:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2467:2467 -> a
-    849:849:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2462:2462 -> a
-    849:849:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2469 -> a
-    850:851:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2469:2470 -> a
-    852:860:void lambda$markProgramMethodOverridesAsLive$49(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey,java.util.Set):2472:2480 -> a
-    861:871:void lambda$markProgramMethodOverridesAsLive$48(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2482:2492 -> a
-    872:873:void lambda$markProgramMethodOverridesAsLive$44(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2487:2488 -> a
+    845:845:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2469 -> a
+    846:848:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2469:2469 -> a
+    849:849:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2464:2464 -> a
+    849:849:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2471 -> a
+    850:851:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2471:2472 -> a
+    852:860:void lambda$markProgramMethodOverridesAsLive$49(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey,java.util.Set):2474:2482 -> a
+    861:871:void lambda$markProgramMethodOverridesAsLive$48(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2484:2494 -> a
+    872:873:void lambda$markProgramMethodOverridesAsLive$44(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2489:2490 -> a
     874:874:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
     874:874:void com.android.tools.r8.shaking.InstantiatedObject.apply(java.util.function.Consumer,java.util.function.Consumer):22 -> a
-    874:874:void lambda$markProgramMethodOverridesAsLive$44(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2488 -> a
+    874:874:void lambda$markProgramMethodOverridesAsLive$44(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2490 -> a
     875:877:void com.android.tools.r8.shaking.InstantiatedObject.apply(java.util.function.Consumer,java.util.function.Consumer):23:25 -> a
-    875:877:void lambda$markProgramMethodOverridesAsLive$44(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2488 -> a
+    875:877:void lambda$markProgramMethodOverridesAsLive$44(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2490 -> a
     878:878:boolean com.android.tools.r8.shaking.InstantiatedObject.isLambda():0:0 -> a
     878:878:void com.android.tools.r8.shaking.InstantiatedObject.apply(java.util.function.Consumer,java.util.function.Consumer):25 -> a
-    878:878:void lambda$markProgramMethodOverridesAsLive$44(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2488 -> a
+    878:878:void lambda$markProgramMethodOverridesAsLive$44(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2490 -> a
     879:880:void com.android.tools.r8.shaking.InstantiatedObject.apply(java.util.function.Consumer,java.util.function.Consumer):25:26 -> a
-    879:880:void lambda$markProgramMethodOverridesAsLive$44(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2488 -> a
-    881:881:boolean lambda$markProgramMethodOverridesAsLive$45(com.android.tools.r8.graph.DexDefinition):2491:2491 -> a
+    879:880:void lambda$markProgramMethodOverridesAsLive$44(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2490 -> a
+    881:881:boolean lambda$markProgramMethodOverridesAsLive$45(com.android.tools.r8.graph.DexDefinition):2493:2493 -> a
     882:882:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):159:159 -> a
-    882:882:boolean lambda$markProgramMethodOverridesAsLive$45(com.android.tools.r8.graph.DexDefinition):2491 -> a
-    883:883:void lambda$markProgramMethodOverridesAsLive$47(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.LookupTarget):2494:2494 -> a
-    884:886:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markProgramMethodOverridesAsLive$46(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):2497:2497 -> a
-    887:887:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2545:2545 -> a
-    888:930:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4083:4125 -> a
-    888:930:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2549 -> a
-    931:936:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2552:2557 -> a
+    882:882:boolean lambda$markProgramMethodOverridesAsLive$45(com.android.tools.r8.graph.DexDefinition):2493 -> a
+    883:883:void lambda$markProgramMethodOverridesAsLive$47(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.LookupTarget):2496:2496 -> a
+    884:886:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markProgramMethodOverridesAsLive$46(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):2499:2499 -> a
+    887:887:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2547:2547 -> a
+    888:930:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4097:4139 -> a
+    888:930:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2551 -> a
+    931:936:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2554:2559 -> a
     937:937:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
-    937:937:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2557 -> a
-    938:938:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2560:2560 -> a
-    939:939:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2559:2559 -> a
-    940:940:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$50(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):2555:2555 -> a
-    941:952:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2566:2577 -> a
-    953:955:void lambda$markOverridesAsLibraryMethodOverrides$51(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):2579:2581 -> a
-    956:975:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2677:2696 -> a
-    976:976:void lambda$markFieldAsLive$52(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2696:2696 -> a
-    977:977:void lambda$markFieldAsReachable$54(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2722:2722 -> a
-    978:979:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2733:2734 -> a
+    937:937:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2559 -> a
+    938:938:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2562:2562 -> a
+    939:939:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2561:2561 -> a
+    940:940:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$50(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):2557:2557 -> a
+    941:952:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2568:2579 -> a
+    953:955:void lambda$markOverridesAsLibraryMethodOverrides$51(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):2581:2583 -> a
+    956:975:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2679:2698 -> a
+    976:976:void lambda$markFieldAsLive$52(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2698:2698 -> a
+    977:977:void lambda$markFieldAsReachable$54(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2724:2724 -> a
+    978:979:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2735:2736 -> a
     980:980:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():62:62 -> a
-    980:980:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2735 -> a
-    981:981:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2735:2735 -> a
-    982:982:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):2774:2774 -> a
-    983:984:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):2784:2785 -> a
-    985:985:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2828:2828 -> a
-    986:987:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):2854:2855 -> a
-    988:998:boolean isReachable(com.android.tools.r8.graph.Definition):2859:2869 -> a
-    999:999:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2770:2770 -> a
-    999:999:boolean isReachable(com.android.tools.r8.graph.Definition):2870 -> a
-    1000:1000:boolean isFieldReferenced(com.android.tools.r8.graph.ProgramField):2766:2766 -> a
-    1000:1000:boolean isReachable(com.android.tools.r8.graph.Definition):2870 -> a
-    1001:1003:boolean isReachable(com.android.tools.r8.graph.Definition):2872:2874 -> a
-    1004:1004:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2840:2840 -> a
-    1004:1004:boolean isReachable(com.android.tools.r8.graph.Definition):2874 -> a
-    1005:1005:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2836:2836 -> a
-    1005:1005:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2840 -> a
-    1005:1005:boolean isReachable(com.android.tools.r8.graph.Definition):2874 -> a
-    1006:1006:boolean isReachable(com.android.tools.r8.graph.Definition):2878:2878 -> a
-    1007:1007:void forAllLiveClasses(java.util.function.Consumer):2882:2882 -> a
-    1008:1024:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2887:2903 -> a
-    1025:1025:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2032:2032 -> a
-    1025:1025:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2907 -> a
+    980:980:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2737 -> a
+    981:981:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2737:2737 -> a
+    982:982:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):2776:2776 -> a
+    983:984:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):2786:2787 -> a
+    985:985:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2830:2830 -> a
+    986:987:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):2856:2857 -> a
+    988:998:boolean isReachable(com.android.tools.r8.graph.Definition):2861:2871 -> a
+    999:999:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2772:2772 -> a
+    999:999:boolean isReachable(com.android.tools.r8.graph.Definition):2872 -> a
+    1000:1000:boolean isFieldReferenced(com.android.tools.r8.graph.ProgramField):2768:2768 -> a
+    1000:1000:boolean isReachable(com.android.tools.r8.graph.Definition):2872 -> a
+    1001:1003:boolean isReachable(com.android.tools.r8.graph.Definition):2874:2876 -> a
+    1004:1004:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2842:2842 -> a
+    1004:1004:boolean isReachable(com.android.tools.r8.graph.Definition):2876 -> a
+    1005:1005:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2838:2838 -> a
+    1005:1005:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2842 -> a
+    1005:1005:boolean isReachable(com.android.tools.r8.graph.Definition):2876 -> a
+    1006:1006:boolean isReachable(com.android.tools.r8.graph.Definition):2880:2880 -> a
+    1007:1007:void forAllLiveClasses(java.util.function.Consumer):2884:2884 -> a
+    1008:1024:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2889:2905 -> a
+    1025:1025:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2034:2034 -> a
+    1025:1025:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2909 -> a
     1026:1027:com.android.tools.r8.graph.MethodResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):613:614 -> a
-    1026:1027:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2032 -> a
-    1026:1027:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2907 -> a
-    1028:1030:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2033:2035 -> a
-    1028:1030:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2907 -> a
-    1031:1036:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2034:2039 -> a
-    1031:1036:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2907 -> a
-    1037:1041:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2038:2042 -> a
-    1037:1041:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2907 -> a
-    1042:1053:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2912:2923 -> a
-    1054:1054:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2462:2462 -> a
-    1054:1054:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2924 -> a
-    1055:1063:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2924:2932 -> a
+    1026:1027:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2034 -> a
+    1026:1027:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2909 -> a
+    1028:1030:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2035:2037 -> a
+    1028:1030:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2909 -> a
+    1031:1036:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2036:2041 -> a
+    1031:1036:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2909 -> a
+    1037:1041:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2040:2044 -> a
+    1037:1041:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2909 -> a
+    1042:1053:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2914:2925 -> a
+    1054:1054:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2464:2464 -> a
+    1054:1054:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2926 -> a
+    1055:1063:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2926:2934 -> a
     1064:1064:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    1064:1064:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2932 -> a
-    1065:1087:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2937:2959 -> a
-    1088:1088:void lambda$markVirtualMethodAsReachable$57(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2956:2956 -> a
-    1089:1089:void lambda$markVirtualMethodAsReachable$60(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.LookupTarget):2961:2961 -> a
-    1090:1092:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$59(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):2964:2964 -> a
-    1093:1096:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2970:2973 -> a
-    1097:1097:void lambda$markVirtualDispatchTargetAsLive$63(com.android.tools.r8.graph.LookupTarget,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2973:2973 -> a
-    1098:1100:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.DexClassAndMethod,java.util.function.Function):2978:2980 -> a
-    1098:1100:void lambda$markVirtualDispatchTargetAsLive$61(java.util.function.Function,com.android.tools.r8.graph.DexClassAndMethod):2971 -> a
-    1101:1104:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):2986:2989 -> a
-    1101:1104:void lambda$markVirtualDispatchTargetAsLive$62(java.util.function.Function,com.android.tools.r8.graph.LookupLambdaTarget):2972 -> a
-    1105:1105:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):2988:2988 -> a
-    1105:1105:void lambda$markVirtualDispatchTargetAsLive$62(java.util.function.Function,com.android.tools.r8.graph.LookupLambdaTarget):2972 -> a
-    1106:1107:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2998:2999 -> a
-    1108:1111:void lambda$markFailedMethodResolutionTargets$64(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):3001:3004 -> a
-    1112:1112:void lambda$traceMainDex$67(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexEncodedMethod):3092:3092 -> a
-    1113:1119:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3104:3110 -> a
-    1120:1120:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):527:527 -> a
-    1120:1120:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3110 -> a
-    1121:1123:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3114:3116 -> a
-    1124:1124:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):527:527 -> a
-    1124:1124:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3116 -> a
-    1125:1126:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3118:3119 -> a
-    1127:1127:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):527:527 -> a
-    1127:1127:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3119 -> a
-    1128:1150:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3123:3145 -> a
-    1151:1154:void finalizeLibraryMethodOverrideInformation():3595:3598 -> a
-    1151:1154:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3146 -> a
-    1155:1156:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3147:3148 -> a
-    1157:1159:boolean verifyKeptGraph():3605:3607 -> a
-    1157:1159:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3148 -> a
-    1160:1165:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3149:3154 -> a
-    1166:1166:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isWhyAreYouKeeping():227:227 -> a
-    1166:1166:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3154 -> a
-    1167:1167:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3159:3159 -> a
-    1168:1168:void lambda$traceApplication$71(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3147:3147 -> a
-    1169:1170:void includeMinimumKeepInfo(com.android.tools.r8.shaking.RootSetUtils$RootSetBase):3164:3165 -> a
-    1171:1176:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3173:3178 -> a
-    1177:1177:void lambda$applyMinimumKeepInfo$72(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3177:3177 -> a
-    1178:1181:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3186:3189 -> a
+    1064:1064:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2934 -> a
+    1065:1087:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2939:2961 -> a
+    1088:1088:void lambda$markVirtualMethodAsReachable$57(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2958:2958 -> a
+    1089:1089:void lambda$markVirtualMethodAsReachable$60(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.LookupTarget):2963:2963 -> a
+    1090:1092:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$59(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):2966:2966 -> a
+    1093:1096:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2972:2975 -> a
+    1097:1097:void lambda$markVirtualDispatchTargetAsLive$63(com.android.tools.r8.graph.LookupTarget,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2975:2975 -> a
+    1098:1100:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.DexClassAndMethod,java.util.function.Function):2980:2982 -> a
+    1098:1100:void lambda$markVirtualDispatchTargetAsLive$61(java.util.function.Function,com.android.tools.r8.graph.DexClassAndMethod):2973 -> a
+    1101:1104:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):2988:2991 -> a
+    1101:1104:void lambda$markVirtualDispatchTargetAsLive$62(java.util.function.Function,com.android.tools.r8.graph.LookupLambdaTarget):2974 -> a
+    1105:1105:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):2990:2990 -> a
+    1105:1105:void lambda$markVirtualDispatchTargetAsLive$62(java.util.function.Function,com.android.tools.r8.graph.LookupLambdaTarget):2974 -> a
+    1106:1107:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3000:3001 -> a
+    1108:1111:void lambda$markFailedMethodResolutionTargets$64(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):3003:3006 -> a
+    1112:1112:void lambda$traceMainDex$67(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexEncodedMethod):3094:3094 -> a
+    1113:1119:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3106:3112 -> a
+    1120:1120:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):529:529 -> a
+    1120:1120:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3112 -> a
+    1121:1123:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3116:3118 -> a
+    1124:1124:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):529:529 -> a
+    1124:1124:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3118 -> a
+    1125:1126:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3120:3121 -> a
+    1127:1127:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):529:529 -> a
+    1127:1127:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3121 -> a
+    1128:1150:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3125:3147 -> a
+    1151:1154:void finalizeLibraryMethodOverrideInformation():3597:3600 -> a
+    1151:1154:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3148 -> a
+    1155:1156:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3149:3150 -> a
+    1157:1159:boolean verifyKeptGraph():3607:3609 -> a
+    1157:1159:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3150 -> a
+    1160:1165:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3151:3156 -> a
+    1166:1166:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isWhyAreYouKeeping():229:229 -> a
+    1166:1166:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3156 -> a
+    1167:1167:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3161:3161 -> a
+    1168:1168:void lambda$traceApplication$71(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3149:3149 -> a
+    1169:1170:void includeMinimumKeepInfo(com.android.tools.r8.shaking.RootSetUtils$RootSetBase):3166:3167 -> a
+    1171:1176:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3175:3180 -> a
+    1177:1177:void lambda$applyMinimumKeepInfo$72(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3179:3179 -> a
+    1178:1181:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3188:3191 -> a
     1182:1182:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():79:79 -> a
-    1182:1182:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3190 -> a
-    1183:1183:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3191:3191 -> a
+    1182:1182:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3192 -> a
+    1183:1183:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3193:3193 -> a
     1184:1184:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):113:113 -> a
-    1184:1184:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3191 -> a
-    1185:1185:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):503:503 -> a
+    1184:1184:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3193 -> a
+    1185:1185:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):507:507 -> a
     1185:1185:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):113 -> a
-    1185:1185:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3191 -> a
-    1186:1186:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3193:3193 -> a
-    1187:1192:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3224:3229 -> a
-    1193:1193:void lambda$applyMinimumKeepInfo$74(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3228:3228 -> a
-    1194:1197:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3235:3238 -> a
+    1185:1185:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3193 -> a
+    1186:1186:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3195:3195 -> a
+    1187:1192:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3226:3231 -> a
+    1193:1193:void lambda$applyMinimumKeepInfo$74(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3230:3230 -> a
+    1194:1197:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3237:3240 -> a
     1198:1198:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():79:79 -> a
-    1198:1198:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3239 -> a
-    1199:1199:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3240:3240 -> a
+    1198:1198:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3241 -> a
+    1199:1199:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3242:3242 -> a
     1200:1200:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):113:113 -> a
-    1200:1200:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3240 -> a
-    1201:1201:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):503:503 -> a
+    1200:1200:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3242 -> a
+    1201:1201:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):507:507 -> a
     1201:1201:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):113 -> a
-    1201:1201:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3240 -> a
-    1202:1202:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3242:3242 -> a
-    1203:1208:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramMethod):3269:3274 -> a
-    1209:1209:void lambda$applyMinimumKeepInfo$76(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3273:3273 -> a
-    1210:1213:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3282:3285 -> a
+    1201:1201:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3242 -> a
+    1202:1202:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3244:3244 -> a
+    1203:1208:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramMethod):3271:3276 -> a
+    1209:1209:void lambda$applyMinimumKeepInfo$76(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3275:3275 -> a
+    1210:1213:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3284:3287 -> a
     1214:1214:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():79:79 -> a
-    1214:1214:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3286 -> a
-    1215:1215:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3287:3287 -> a
+    1214:1214:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3288 -> a
+    1215:1215:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3289:3289 -> a
     1216:1216:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):113:113 -> a
-    1216:1216:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3287 -> a
-    1217:1217:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):503:503 -> a
+    1216:1216:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3289 -> a
+    1217:1217:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):507:507 -> a
     1217:1217:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):113 -> a
-    1217:1217:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3287 -> a
-    1218:1224:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3283:3289 -> a
-    1225:1228:void applyMinimumKeepInfoDependentOn(com.android.tools.r8.shaking.EnqueuerEvent):3325:3328 -> a
-    1229:1229:void lambda$applyMinimumKeepInfoDependentOn$78(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3331:3331 -> a
-    1230:1230:void lambda$applyMinimumKeepInfoDependentOn$79(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3333:3333 -> a
-    1231:1231:void lambda$applyMinimumKeepInfoDependentOn$80(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3335:3335 -> a
-    1232:1245:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3503:3516 -> a
+    1217:1217:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3289 -> a
+    1218:1224:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3285:3291 -> a
+    1225:1228:void applyMinimumKeepInfoDependentOn(com.android.tools.r8.shaking.EnqueuerEvent):3327:3330 -> a
+    1229:1229:void lambda$applyMinimumKeepInfoDependentOn$78(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3333:3333 -> a
+    1230:1230:void lambda$applyMinimumKeepInfoDependentOn$79(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3335:3335 -> a
+    1231:1231:void lambda$applyMinimumKeepInfoDependentOn$80(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3337:3337 -> a
+    1232:1245:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3505:3518 -> a
     1246:1246:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer.createForR8(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,java.util.function.BiConsumer):71:71 -> a
-    1246:1246:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3517 -> a
-    1247:1277:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3532:3562 -> a
-    1278:1281:void lambda$desugar$82(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3524:3527 -> a
-    1282:1282:void lambda$desugar$83(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):3535:3535 -> a
-    1283:1283:void lambda$desugar$84(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):3542:3542 -> a
-    1284:1286:void recordLambdaSynthesizingContext(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):3566:3568 -> a
-    1287:1289:void recordConstantDynamicSynthesizingContext(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):3573:3575 -> a
-    1290:1322:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3615:3647 -> a
+    1246:1246:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3519 -> a
+    1247:1277:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3534:3564 -> a
+    1278:1281:void lambda$desugar$82(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3526:3529 -> a
+    1282:1282:void lambda$desugar$83(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):3537:3537 -> a
+    1283:1283:void lambda$desugar$84(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):3544:3544 -> a
+    1284:1286:void recordLambdaSynthesizingContext(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):3568:3570 -> a
+    1287:1289:void recordConstantDynamicSynthesizingContext(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):3575:3577 -> a
+    1290:1322:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3617:3649 -> a
     1323:1323:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    1323:1323:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3647 -> a
-    1324:1325:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3648:3649 -> a
+    1323:1323:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3649 -> a
+    1324:1325:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3650:3651 -> a
     1326:1326:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    1326:1326:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3649 -> a
-    1327:1385:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3650:3708 -> a
-    1386:1391:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):3818:3823 -> a
-    1386:1391:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3715 -> a
-    1392:1400:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3716:3724 -> a
-    1401:1401:void lambda$createEnqueuerResult$85(java.util.Set,com.android.tools.r8.graph.DexProgramClass):3618:3618 -> a
-    1402:1402:boolean lambda$createEnqueuerResult$86(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):3624:3624 -> a
-    1403:1415:java.util.Set amendWithCompanionMethods(java.util.Set):3728:3740 -> a
-    1416:1418:void lambda$amendWithCompanionMethods$88(java.util.Set,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3735:3737 -> a
-    1419:1435:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3757:3773 -> a
-    1436:1440:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3829:3833 -> a
+    1326:1326:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3651 -> a
+    1327:1385:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3652:3710 -> a
+    1386:1391:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):3820:3825 -> a
+    1386:1391:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3717 -> a
+    1392:1400:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3718:3726 -> a
+    1401:1401:void lambda$createEnqueuerResult$85(java.util.Set,com.android.tools.r8.graph.DexProgramClass):3620:3620 -> a
+    1402:1402:boolean lambda$createEnqueuerResult$86(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):3626:3626 -> a
+    1403:1415:java.util.Set amendWithCompanionMethods(java.util.Set):3730:3742 -> a
+    1416:1418:void lambda$amendWithCompanionMethods$88(java.util.Set,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3737:3739 -> a
+    1419:1435:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3759:3775 -> a
+    1436:1440:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3831:3835 -> a
     1441:1441:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():316:316 -> a
-    1441:1441:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3833 -> a
-    1442:1442:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3834:3834 -> a
+    1441:1441:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3835 -> a
+    1442:1442:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3836:3836 -> a
     1443:1443:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():320:320 -> a
-    1443:1443:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3834 -> a
-    1444:1460:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3835:3851 -> a
+    1443:1443:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3836 -> a
+    1444:1460:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3837:3853 -> a
     1461:1461:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSetBuilder com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.Enqueuer):1944:1944 -> a
-    1461:1461:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3852 -> a
-    1462:1472:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3853:3863 -> a
+    1461:1461:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3854 -> a
+    1462:1472:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3855:3865 -> a
     1473:1473:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():316:316 -> a
-    1473:1473:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3863 -> a
-    1474:1478:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3870:3874 -> a
+    1473:1473:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3865 -> a
+    1474:1478:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3872:3876 -> a
     1479:1479:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():316:316 -> a
-    1479:1479:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3874 -> a
-    1480:1481:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3880:3881 -> a
+    1479:1479:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3876 -> a
+    1480:1481:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3882:3883 -> a
     1482:1482:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():316:316 -> a
-    1482:1482:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3881 -> a
-    1483:1499:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3886:3902 -> a
+    1482:1482:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3883 -> a
+    1483:1499:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3888:3904 -> a
     1500:1500:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():316:316 -> a
-    1500:1500:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3902 -> a
-    1501:1516:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3910:3925 -> a
-    1517:1517:java.util.Set lambda$trace$89(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):3848:3848 -> a
-    1518:1518:void lambda$trace$90(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3880:3880 -> a
-    1519:1525:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet):3975:3981 -> a
-    1526:1528:void lambda$addConsequentRootSet$92(com.android.tools.r8.graph.DexType,java.util.Set):3983:3985 -> a
-    1529:1533:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):898:902 -> a
-    1529:1533:void lambda$addConsequentRootSet$92(com.android.tools.r8.graph.DexType,java.util.Set):3986 -> a
-    1534:1541:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4007:4014 -> a
-    1542:1545:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4013:4016 -> a
-    1546:1546:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4015:4015 -> a
-    1547:1554:void retainAnnotationForFinalTreeShaking(java.util.List):4035:4042 -> a
-    1555:1555:void retainAnnotationForFinalTreeShaking(java.util.List):4039:4039 -> a
-    1556:1556:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4075:4075 -> a
-    1557:1557:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> a
-    1557:1557:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4075 -> a
-    1558:1560:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4076:4078 -> a
-    1561:1567:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4150:4156 -> a
-    1568:1568:com.android.tools.r8.shaking.Enqueuer$Mode getMode():507:507 -> a
-    1568:1568:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4210 -> a
-    1568:1568:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4159 -> a
-    1569:1569:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4210:4210 -> a
-    1569:1569:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4159 -> a
-    1570:1570:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3481:3481 -> a
-    1570:1570:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4211 -> a
-    1570:1570:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4159 -> a
-    1571:1573:boolean mustMoveToInterfaceCompanionMethod(com.android.tools.r8.graph.ProgramMethod):3475:3477 -> a
-    1571:1573:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3482 -> a
-    1571:1573:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4211 -> a
-    1571:1573:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4159 -> a
-    1574:1587:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3483:3496 -> a
-    1574:1587:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4211 -> a
-    1574:1587:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4159 -> a
-    1588:1588:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4216:4216 -> a
-    1588:1588:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4159 -> a
-    1589:1593:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4161:4165 -> a
-    1594:1594:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    1594:1594:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4165 -> a
-    1595:1595:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
-    1595:1595:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4167 -> a
-    1596:1596:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4167:4167 -> a
-    1597:1597:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
-    1597:1597:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4168 -> a
-    1598:1603:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4168:4173 -> a
-    1604:1604:void lambda$markMethodAsLive$93(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4173:4173 -> a
-    1605:1605:void lambda$markMethodAsTargeted$94(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4193:4193 -> a
-    1606:1606:void lambda$traceMethodDefinitionExcludingCode$95(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexAnnotation):4203:4203 -> a
-    1607:1607:void lambda$traceCode$96(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4224:4224 -> a
-    1608:1608:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4250:4250 -> a
-    1609:1624:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):4274:4289 -> a
-    1609:1624:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4252 -> a
-    1625:1625:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4256:4256 -> a
-    1626:1626:boolean com.android.tools.r8.graph.DexClass.isAnnotation():651:651 -> a
-    1626:1626:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4257 -> a
-    1627:1637:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4258:4268 -> a
-    1638:1638:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4265:4265 -> a
-    1639:1645:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4307:4313 -> a
-    1646:1653:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4416:4423 -> a
-    1646:1653:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4314 -> a
-    1654:1666:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4422:4434 -> a
-    1654:1666:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4314 -> a
-    1667:1667:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    1667:1667:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4436 -> a
-    1667:1667:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4314 -> a
-    1668:1670:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4437:4439 -> a
-    1668:1670:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4314 -> a
-    1671:1671:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4317:4317 -> a
-    1672:1693:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4446:4467 -> a
-    1672:1693:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4318 -> a
-    1694:1707:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4466:4479 -> a
-    1694:1707:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4318 -> a
-    1708:1708:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
-    1708:1708:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4479 -> a
-    1708:1708:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4318 -> a
-    1709:1757:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4484:4532 -> a
-    1709:1757:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4318 -> a
-    1758:1758:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    1758:1758:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4537 -> a
-    1758:1758:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4318 -> a
-    1759:1761:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4538:4540 -> a
-    1759:1761:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4318 -> a
-    1762:1762:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4321:4321 -> a
-    1763:1766:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4598:4601 -> a
-    1763:1766:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4322 -> a
-    1767:1767:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> a
-    1767:1767:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4602 -> a
-    1767:1767:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4322 -> a
-    1768:1768:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):50:50 -> a
-    1768:1768:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> a
-    1768:1768:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4602 -> a
-    1768:1768:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4322 -> a
-    1769:1769:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4602:4602 -> a
-    1769:1769:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4322 -> a
-    1770:1774:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4325:4329 -> a
-    1775:1781:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4608:4614 -> a
-    1775:1781:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4330 -> a
-    1782:1782:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
-    1782:1782:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4614 -> a
-    1782:1782:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4330 -> a
-    1783:1794:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4615:4626 -> a
-    1783:1794:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4330 -> a
-    1795:1795:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4619:4619 -> a
-    1795:1795:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4330 -> a
-    1796:1796:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    1796:1796:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4631 -> a
-    1796:1796:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4330 -> a
-    1797:1797:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4631:4631 -> a
-    1797:1797:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4330 -> a
-    1798:1798:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    1798:1798:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4633 -> a
-    1798:1798:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4330 -> a
-    1799:1800:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4634:4635 -> a
-    1799:1800:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4330 -> a
-    1801:1810:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4333:4342 -> a
-    1811:1811:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    1811:1811:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4342 -> a
-    1812:1816:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4343:4347 -> a
-    1817:1817:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    1817:1817:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4351 -> a
-    1818:1818:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4351:4351 -> a
-    1819:1819:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():643:643 -> a
-    1819:1819:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4352 -> a
-    1820:1820:boolean com.android.tools.r8.graph.DexClass.isAnnotation():651:651 -> a
-    1820:1820:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():643 -> a
-    1820:1820:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4352 -> a
-    1821:1821:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():643:643 -> a
-    1821:1821:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4352 -> a
-    1822:1839:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4352:4369 -> a
-    1840:1840:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> a
-    1840:1840:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4379 -> a
-    1841:1844:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4379:4382 -> a
-    1845:1845:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    1845:1845:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4383 -> a
-    1846:1851:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4382:4387 -> a
+    1500:1500:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3904 -> a
+    1501:1516:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3912:3927 -> a
+    1517:1517:java.util.Set lambda$trace$89(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):3850:3850 -> a
+    1518:1518:void lambda$trace$90(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3882:3882 -> a
+    1519:1519:void lambda$postProcessingDesugaring$91(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):3942:3942 -> a
+    1520:1520:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():760:760 -> a
+    1520:1520:void lambda$postProcessingDesugaring$91(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):3946 -> a
+    1521:1524:void lambda$postProcessingDesugaring$91(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):3946:3949 -> a
+    1525:1525:void com.android.tools.r8.shaking.MissingClasses$Builder.addNewMissingClassWithDesugarDiagnostic(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.errors.DesugarDiagnostic):101:101 -> a
+    1525:1525:void lambda$postProcessingDesugaring$91(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):3942 -> a
+    1526:1532:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet):3989:3995 -> a
+    1533:1535:void lambda$addConsequentRootSet$93(com.android.tools.r8.graph.DexType,java.util.Set):3997:3999 -> a
+    1536:1540:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):900:904 -> a
+    1536:1540:void lambda$addConsequentRootSet$93(com.android.tools.r8.graph.DexType,java.util.Set):4000 -> a
+    1541:1548:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4021:4028 -> a
+    1549:1552:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4027:4030 -> a
+    1553:1553:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4029:4029 -> a
+    1554:1561:void retainAnnotationForFinalTreeShaking(java.util.List):4049:4056 -> a
+    1562:1562:void retainAnnotationForFinalTreeShaking(java.util.List):4053:4053 -> a
+    1563:1563:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4089:4089 -> a
+    1564:1564:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> a
+    1564:1564:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4089 -> a
+    1565:1567:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4090:4092 -> a
+    1568:1574:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4164:4170 -> a
+    1575:1575:com.android.tools.r8.shaking.Enqueuer$Mode getMode():509:509 -> a
+    1575:1575:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4224 -> a
+    1575:1575:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4173 -> a
+    1576:1576:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4224:4224 -> a
+    1576:1576:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4173 -> a
+    1577:1577:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3483:3483 -> a
+    1577:1577:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4225 -> a
+    1577:1577:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4173 -> a
+    1578:1580:boolean mustMoveToInterfaceCompanionMethod(com.android.tools.r8.graph.ProgramMethod):3477:3479 -> a
+    1578:1580:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3484 -> a
+    1578:1580:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4225 -> a
+    1578:1580:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4173 -> a
+    1581:1594:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3485:3498 -> a
+    1581:1594:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4225 -> a
+    1581:1594:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4173 -> a
+    1595:1595:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4230:4230 -> a
+    1595:1595:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4173 -> a
+    1596:1600:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4175:4179 -> a
+    1601:1601:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    1601:1601:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4179 -> a
+    1602:1602:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
+    1602:1602:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4181 -> a
+    1603:1603:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4181:4181 -> a
+    1604:1604:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
+    1604:1604:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4182 -> a
+    1605:1610:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4182:4187 -> a
+    1611:1611:void lambda$markMethodAsLive$94(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4187:4187 -> a
+    1612:1612:void lambda$markMethodAsTargeted$95(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4207:4207 -> a
+    1613:1613:void lambda$traceMethodDefinitionExcludingCode$96(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexAnnotation):4217:4217 -> a
+    1614:1614:void lambda$traceCode$97(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4238:4238 -> a
+    1615:1615:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4264:4264 -> a
+    1616:1631:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):4288:4303 -> a
+    1616:1631:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4266 -> a
+    1632:1632:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4270:4270 -> a
+    1633:1633:boolean com.android.tools.r8.graph.DexClass.isAnnotation():651:651 -> a
+    1633:1633:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4271 -> a
+    1634:1644:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4272:4282 -> a
+    1645:1645:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4279:4279 -> a
+    1646:1652:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4321:4327 -> a
+    1653:1660:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4430:4437 -> a
+    1653:1660:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4328 -> a
+    1661:1673:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4436:4448 -> a
+    1661:1673:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4328 -> a
+    1674:1674:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    1674:1674:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4450 -> a
+    1674:1674:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4328 -> a
+    1675:1677:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4451:4453 -> a
+    1675:1677:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4328 -> a
+    1678:1678:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4331:4331 -> a
+    1679:1700:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4460:4481 -> a
+    1679:1700:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4332 -> a
+    1701:1714:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4480:4493 -> a
+    1701:1714:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4332 -> a
+    1715:1715:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
+    1715:1715:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4493 -> a
+    1715:1715:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4332 -> a
+    1716:1764:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4498:4546 -> a
+    1716:1764:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4332 -> a
+    1765:1765:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    1765:1765:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4551 -> a
+    1765:1765:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4332 -> a
+    1766:1768:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4552:4554 -> a
+    1766:1768:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4332 -> a
+    1769:1769:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4335:4335 -> a
+    1770:1773:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4612:4615 -> a
+    1770:1773:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4336 -> a
+    1774:1774:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> a
+    1774:1774:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4616 -> a
+    1774:1774:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4336 -> a
+    1775:1775:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):50:50 -> a
+    1775:1775:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> a
+    1775:1775:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4616 -> a
+    1775:1775:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4336 -> a
+    1776:1776:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4616:4616 -> a
+    1776:1776:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4336 -> a
+    1777:1781:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4339:4343 -> a
+    1782:1788:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4622:4628 -> a
+    1782:1788:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4344 -> a
+    1789:1789:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
+    1789:1789:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4628 -> a
+    1789:1789:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4344 -> a
+    1790:1801:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4629:4640 -> a
+    1790:1801:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4344 -> a
+    1802:1802:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4633:4633 -> a
+    1802:1802:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4344 -> a
+    1803:1803:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    1803:1803:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4645 -> a
+    1803:1803:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4344 -> a
+    1804:1804:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4645:4645 -> a
+    1804:1804:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4344 -> a
+    1805:1805:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    1805:1805:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4647 -> a
+    1805:1805:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4344 -> a
+    1806:1807:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4648:4649 -> a
+    1806:1807:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4344 -> a
+    1808:1817:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4347:4356 -> a
+    1818:1818:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    1818:1818:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4356 -> a
+    1819:1823:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4357:4361 -> a
+    1824:1824:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    1824:1824:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4365 -> a
+    1825:1825:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4365:4365 -> a
+    1826:1826:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():643:643 -> a
+    1826:1826:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4366 -> a
+    1827:1827:boolean com.android.tools.r8.graph.DexClass.isAnnotation():651:651 -> a
+    1827:1827:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():643 -> a
+    1827:1827:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4366 -> a
+    1828:1828:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():643:643 -> a
+    1828:1828:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4366 -> a
+    1829:1846:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4366:4383 -> a
+    1847:1847:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> a
+    1847:1847:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4393 -> a
+    1848:1851:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4393:4396 -> a
     1852:1852:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    1852:1852:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4389 -> a
-    1853:1867:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4389:4403 -> a
-    1868:1868:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    1868:1868:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4404 -> a
-    1869:1873:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4405:4409 -> a
-    1874:1875:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4406:4407 -> a
-    1876:1876:void lambda$handleReflectiveBehavior$99(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4388:4388 -> a
-    1877:1883:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4550:4556 -> a
-    1884:1884:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
-    1884:1884:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4556 -> a
-    1885:1901:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4561:4577 -> a
-    1902:1902:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    1902:1902:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4578 -> a
-    1903:1907:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4579:4583 -> a
-    1908:1908:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):274:274 -> a
-    1908:1908:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4583 -> a
-    1909:1909:void lambda$handleJavaLangReflectProxyNewProxyInstance$100(com.android.tools.r8.shaking.KeepClassInfo$Joiner):4577:4577 -> a
-    1910:1912:void lambda$handleJavaLangReflectProxyNewProxyInstance$102(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):4585:4587 -> a
-    1913:1913:void lambda$handleJavaLangReflectProxyNewProxyInstance$101(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4586:4586 -> a
-    1914:1925:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4642:4653 -> a
+    1852:1852:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4397 -> a
+    1853:1858:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4396:4401 -> a
+    1859:1859:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    1859:1859:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4403 -> a
+    1860:1874:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4403:4417 -> a
+    1875:1875:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    1875:1875:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4418 -> a
+    1876:1880:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4419:4423 -> a
+    1881:1882:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4420:4421 -> a
+    1883:1883:void lambda$handleReflectiveBehavior$100(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4402:4402 -> a
+    1884:1890:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4564:4570 -> a
+    1891:1891:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
+    1891:1891:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4570 -> a
+    1892:1908:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4575:4591 -> a
+    1909:1909:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    1909:1909:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4592 -> a
+    1910:1914:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4593:4597 -> a
+    1915:1915:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):274:274 -> a
+    1915:1915:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4597 -> a
+    1916:1916:void lambda$handleJavaLangReflectProxyNewProxyInstance$101(com.android.tools.r8.shaking.KeepClassInfo$Joiner):4591:4591 -> a
+    1917:1919:void lambda$handleJavaLangReflectProxyNewProxyInstance$103(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):4599:4601 -> a
+    1920:1920:void lambda$handleJavaLangReflectProxyNewProxyInstance$102(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4600:4600 -> a
+    1921:1932:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4656:4667 -> a
     1:1:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> b
-    1:1:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2800 -> b
-    2:4:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2803:2805 -> b
+    1:1:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2802 -> b
+    2:4:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2805:2807 -> b
     5:5:boolean com.android.tools.r8.shaking.EnqueuerEvent.isLiveClassEvent():0:0 -> b
-    5:5:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2809 -> b
-    6:6:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2810:2810 -> b
+    5:5:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2811 -> b
+    6:6:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2812:2812 -> b
     7:7:boolean com.android.tools.r8.shaking.EnqueuerEvent.isInstantiatedClassEvent():0:0 -> b
-    7:7:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2812 -> b
-    8:11:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2813:2816 -> b
+    7:7:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2814 -> b
+    8:11:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2815:2818 -> b
     com.android.tools.r8.graph.DexApplication lambda$synthesize$81(com.android.tools.r8.graph.DexApplication) -> b
     12:12:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.targetedBySuperFrom(com.android.tools.r8.graph.ProgramMethod):79:79 -> b
-    12:12:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3036 -> b
-    13:17:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2020:2024 -> b
-    13:17:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3037 -> b
-    18:21:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2023:2026 -> b
-    18:21:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3037 -> b
-    22:25:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3042:3045 -> b
-    26:47:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3043:3064 -> b
+    12:12:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3038 -> b
+    13:17:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2022:2026 -> b
+    13:17:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3039 -> b
+    18:21:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2025:2028 -> b
+    18:21:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3039 -> b
+    22:25:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3044:3047 -> b
+    26:47:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3045:3066 -> b
     48:48:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    48:48:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3063 -> b
-    49:52:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3066:3069 -> b
+    48:48:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3065 -> b
+    49:52:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3068:3071 -> b
     53:53:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> b
-    53:53:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3070 -> b
-    54:55:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3070:3071 -> b
+    53:53:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3072 -> b
+    54:55:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3072:3073 -> b
     56:56:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> b
-    56:56:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3072 -> b
-    57:57:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3072:3072 -> b
-    58:58:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder access$1100(com.android.tools.r8.shaking.Enqueuer):184:184 -> b
-    59:59:void access$700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):184:184 -> b
-    60:60:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):527:527 -> b
-    61:61:com.android.tools.r8.shaking.Enqueuer registerExceptionGuardAnalysis(com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):547:547 -> b
-    62:63:void setInitialDeadProtoTypes(java.util.Set):556:557 -> b
-    64:64:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):597:597 -> b
-    65:72:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):660:667 -> b
-    73:77:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,java.util.function.BiConsumer):681:685 -> b
-    73:77:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):666 -> b
-    78:79:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):741:742 -> b
-    80:80:boolean registerReflectiveFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):925:925 -> b
-    81:81:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):929:929 -> b
-    81:81:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1476 -> b
-    82:108:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1480:1506 -> b
+    56:56:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3074 -> b
+    57:57:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3074:3074 -> b
+    58:58:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder access$1100(com.android.tools.r8.shaking.Enqueuer):186:186 -> b
+    59:59:void access$700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):186:186 -> b
+    60:60:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):529:529 -> b
+    61:61:com.android.tools.r8.shaking.Enqueuer registerExceptionGuardAnalysis(com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):549:549 -> b
+    62:63:void setInitialDeadProtoTypes(java.util.Set):558:559 -> b
+    64:64:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):599:599 -> b
+    65:72:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):662:669 -> b
+    73:77:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,java.util.function.BiConsumer):683:687 -> b
+    73:77:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):668 -> b
+    78:79:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):743:744 -> b
+    80:80:boolean registerReflectiveFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):927:927 -> b
+    81:81:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):931:931 -> b
+    81:81:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1478 -> b
+    82:108:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1482:1508 -> b
     109:109:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    109:109:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1506 -> b
-    110:112:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1509:1511 -> b
-    113:115:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1714:1716 -> b
-    113:115:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1511 -> b
+    109:109:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1508 -> b
+    110:112:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1511:1513 -> b
+    113:115:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1716:1718 -> b
+    113:115:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1513 -> b
     116:116:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> b
-    116:116:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1514 -> b
-    117:117:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1515:1515 -> b
-    118:118:void traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1033:1033 -> b
-    119:119:void traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1102:1102 -> b
-    119:119:void traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1034 -> b
-    120:120:void lambda$traceExceptionGuard$13(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):1223:1223 -> b
-    121:126:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1282:1287 -> b
+    116:116:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1516 -> b
+    117:117:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1517:1517 -> b
+    118:118:void traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1035:1035 -> b
+    119:119:void traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1104:1104 -> b
+    119:119:void traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1036 -> b
+    120:120:void lambda$traceExceptionGuard$13(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):1225:1225 -> b
+    121:126:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1284:1289 -> b
     127:127:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    127:127:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1287 -> b
-    128:129:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1289:1290 -> b
-    130:130:void lambda$traceInvokeInterface$18(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1290:1290 -> b
-    131:131:java.lang.Boolean lambda$traceStaticFieldWrite$25(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1634:1634 -> b
-    132:132:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$33(com.android.tools.r8.graph.DexType):1870:1870 -> b
-    133:167:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1886:1920 -> b
+    127:127:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1289 -> b
+    128:129:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1291:1292 -> b
+    130:130:void lambda$traceInvokeInterface$18(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1292:1292 -> b
+    131:131:java.lang.Boolean lambda$traceStaticFieldWrite$25(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1636:1636 -> b
+    132:132:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$33(com.android.tools.r8.graph.DexType):1872:1872 -> b
+    133:167:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1888:1922 -> b
     168:168:boolean com.android.tools.r8.graph.DexClass.isPublic():724:724 -> b
-    168:168:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1922 -> b
-    169:169:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1923:1923 -> b
-    170:170:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1721:1721 -> b
-    170:170:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1926 -> b
-    171:171:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1924:1924 -> b
-    172:172:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1721:1721 -> b
-    172:172:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1894 -> b
-    173:173:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1943:1943 -> b
+    168:168:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1924 -> b
+    169:169:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1925:1925 -> b
+    170:170:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1723:1723 -> b
+    170:170:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1928 -> b
+    171:171:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1926:1926 -> b
+    172:172:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1723:1723 -> b
+    172:172:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1896 -> b
+    173:173:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1945:1945 -> b
     174:174:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> b
-    174:174:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1944 -> b
-    175:175:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1949:1949 -> b
-    175:175:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1941 -> b
-    176:177:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1954:1955 -> b
-    176:177:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1949 -> b
-    176:177:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1941 -> b
-    178:178:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2164:2164 -> b
-    179:179:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2379:2379 -> b
+    174:174:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1946 -> b
+    175:175:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1951:1951 -> b
+    175:175:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1943 -> b
+    176:177:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1956:1957 -> b
+    176:177:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1951 -> b
+    176:177:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1943 -> b
+    178:178:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2166:2166 -> b
+    179:179:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2381:2381 -> b
     180:180:boolean com.android.tools.r8.graph.DexClass.isAnnotation():651:651 -> b
-    180:180:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2379 -> b
-    181:186:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2379:2384 -> b
-    187:188:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2612:2613 -> b
-    187:188:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2385 -> b
-    189:189:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2705:2705 -> b
-    190:190:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> b
-    190:190:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2705 -> b
-    191:193:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2705:2707 -> b
-    194:210:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2706:2722 -> b
-    211:211:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2716:2716 -> b
-    212:221:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2739:2748 -> b
-    222:222:boolean isFieldReferenced(com.android.tools.r8.graph.DexEncodedField):2761:2761 -> b
-    223:223:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2770:2770 -> b
-    224:224:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2836:2836 -> b
-    225:226:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2844:2845 -> b
-    227:227:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2850:2850 -> b
-    227:227:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2845 -> b
-    228:228:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2846:2846 -> b
-    229:229:boolean lambda$markVirtualMethodAsReachable$58(com.android.tools.r8.graph.DexDefinition):2958:2958 -> b
+    180:180:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2381 -> b
+    181:186:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2381:2386 -> b
+    187:188:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2614:2615 -> b
+    187:188:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2387 -> b
+    189:189:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2707:2707 -> b
+    190:190:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> b
+    190:190:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2707 -> b
+    191:193:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2707:2709 -> b
+    194:210:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2708:2724 -> b
+    211:211:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2718:2718 -> b
+    212:221:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2741:2750 -> b
+    222:222:boolean isFieldReferenced(com.android.tools.r8.graph.DexEncodedField):2763:2763 -> b
+    223:223:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2772:2772 -> b
+    224:224:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2838:2838 -> b
+    225:226:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2846:2847 -> b
+    227:227:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2852:2852 -> b
+    227:227:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2847 -> b
+    228:228:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2848:2848 -> b
+    229:229:boolean lambda$markVirtualMethodAsReachable$58(com.android.tools.r8.graph.DexDefinition):2960:2960 -> b
     230:230:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):159:159 -> b
-    230:230:boolean lambda$markVirtualMethodAsReachable$58(com.android.tools.r8.graph.DexDefinition):2958 -> b
-    231:231:void lambda$markEnumValuesAsReachable$65(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3029:3029 -> b
-    232:242:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3081:3091 -> b
-    243:243:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isInitialMainDexTracing():211:211 -> b
-    243:243:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3091 -> b
-    244:247:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3092:3095 -> b
-    248:248:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isGenerateMainDexList():219:219 -> b
-    248:248:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3095 -> b
-    249:253:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3094:3098 -> b
+    230:230:boolean lambda$markVirtualMethodAsReachable$58(com.android.tools.r8.graph.DexDefinition):2960 -> b
+    231:231:void lambda$markEnumValuesAsReachable$65(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3031:3031 -> b
+    232:242:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3083:3093 -> b
+    243:243:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isInitialMainDexTracing():213:213 -> b
+    243:243:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3093 -> b
+    244:247:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3094:3097 -> b
+    248:248:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isGenerateMainDexList():221:221 -> b
+    248:248:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3097 -> b
+    249:253:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3096:3100 -> b
     254:254:com.android.tools.r8.shaking.MainDexInfo com.android.tools.r8.shaking.MainDexInfo$Builder.build(com.android.tools.r8.shaking.MainDexInfo):405:405 -> b
-    254:254:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3099 -> b
-    255:255:void lambda$traceApplication$68(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3136:3136 -> b
-    256:256:void lambda$traceApplication$69(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3138:3138 -> b
-    257:257:void lambda$traceApplication$70(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3140:3140 -> b
-    258:258:void lambda$applyMinimumKeepInfoWhenLive$73(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3187:3187 -> b
-    259:259:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3200:3200 -> b
-    260:260:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():440:440 -> b
-    260:260:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3201 -> b
-    261:261:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3202:3202 -> b
-    262:262:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():432:432 -> b
-    262:262:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3202 -> b
-    263:264:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3202:3203 -> b
-    265:265:void lambda$applyMinimumKeepInfoWhenLive$75(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3236:3236 -> b
-    266:266:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3247:3247 -> b
-    267:267:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():440:440 -> b
-    267:267:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3248 -> b
-    268:268:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3249:3249 -> b
-    269:269:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():432:432 -> b
-    269:269:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3249 -> b
-    270:271:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3249:3250 -> b
-    272:272:void lambda$applyMinimumKeepInfoWhenLiveOrTargeted$77(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3283:3283 -> b
-    273:273:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3296:3296 -> b
-    274:274:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():440:440 -> b
-    274:274:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3297 -> b
-    275:275:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3298:3298 -> b
-    276:276:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():432:432 -> b
-    276:276:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3298 -> b
-    277:280:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3298:3301 -> b
-    281:281:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():432:432 -> b
-    281:281:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3302 -> b
-    282:283:void enqueueHolderWithDependentInstanceConstructor(com.android.tools.r8.graph.ProgramMethod,java.util.Set):1936:1937 -> b
-    282:283:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3302 -> b
-    284:286:void recordTwrCloseResourceMethodSynthesizingContext(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3580:3582 -> b
-    287:287:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3992:3992 -> b
+    254:254:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3101 -> b
+    255:255:void lambda$traceApplication$68(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3138:3138 -> b
+    256:256:void lambda$traceApplication$69(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3140:3140 -> b
+    257:257:void lambda$traceApplication$70(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3142:3142 -> b
+    258:258:void lambda$applyMinimumKeepInfoWhenLive$73(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3189:3189 -> b
+    259:259:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3202:3202 -> b
+    260:260:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():444:444 -> b
+    260:260:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3203 -> b
+    261:261:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3204:3204 -> b
+    262:262:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():436:436 -> b
+    262:262:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3204 -> b
+    263:264:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3204:3205 -> b
+    265:265:void lambda$applyMinimumKeepInfoWhenLive$75(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3238:3238 -> b
+    266:266:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3249:3249 -> b
+    267:267:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():444:444 -> b
+    267:267:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3250 -> b
+    268:268:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3251:3251 -> b
+    269:269:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():436:436 -> b
+    269:269:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3251 -> b
+    270:271:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3251:3252 -> b
+    272:272:void lambda$applyMinimumKeepInfoWhenLiveOrTargeted$77(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3285:3285 -> b
+    273:273:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3298:3298 -> b
+    274:274:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():444:444 -> b
+    274:274:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3299 -> b
+    275:275:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3300:3300 -> b
+    276:276:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():436:436 -> b
+    276:276:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3300 -> b
+    277:280:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3300:3303 -> b
+    281:281:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():436:436 -> b
+    281:281:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3304 -> b
+    282:283:void enqueueHolderWithDependentInstanceConstructor(com.android.tools.r8.graph.ProgramMethod,java.util.Set):1938:1939 -> b
+    282:283:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3304 -> b
+    284:286:void recordTwrCloseResourceMethodSynthesizingContext(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3582:3584 -> b
+    287:287:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4006:4006 -> b
     288:288:com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder com.android.tools.r8.shaking.RootSetUtils$RootSet.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):1885:1885 -> b
-    288:288:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3992 -> b
-    289:290:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3993:3994 -> b
-    291:300:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):4022:4031 -> b
-    291:300:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3995 -> b
-    301:301:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3999:3999 -> b
-    302:310:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):4134:4142 -> b
-    311:315:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4240:4244 -> b
-    316:316:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4243:4243 -> b
-    317:321:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):4298:4302 -> b
-    322:322:void lambda$handleReflectiveBehavior$98(com.android.tools.r8.shaking.KeepClassInfo$Joiner):4361:4361 -> b
-    1:1:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection access$1200(com.android.tools.r8.shaking.Enqueuer):184:184 -> c
-    2:6:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory createUseRegistryFactory():515:519 -> c
-    7:7:com.android.tools.r8.shaking.Enqueuer registerInstanceOfAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):537:537 -> c
-    8:9:void setInitialPrunedTypes(java.util.Set):561:562 -> c
-    10:17:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):607:614 -> c
-    18:18:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):675:675 -> c
-    19:19:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):753:753 -> c
-    20:20:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):653:653 -> c
-    20:20:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):753 -> c
-    21:21:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):754:754 -> c
-    22:22:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):921:921 -> c
-    22:22:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1528 -> c
-    23:54:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1532:1563 -> c
+    288:288:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4006 -> b
+    289:290:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4007:4008 -> b
+    291:300:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):4036:4045 -> b
+    291:300:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4009 -> b
+    301:301:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4013:4013 -> b
+    302:310:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):4148:4156 -> b
+    311:315:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4254:4258 -> b
+    316:316:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4257:4257 -> b
+    317:321:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):4312:4316 -> b
+    322:322:void lambda$handleReflectiveBehavior$99(com.android.tools.r8.shaking.KeepClassInfo$Joiner):4375:4375 -> b
+    1:1:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection access$1200(com.android.tools.r8.shaking.Enqueuer):186:186 -> c
+    2:6:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory createUseRegistryFactory():517:521 -> c
+    7:7:com.android.tools.r8.shaking.Enqueuer registerInstanceOfAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):539:539 -> c
+    8:9:void setInitialPrunedTypes(java.util.Set):563:564 -> c
+    10:17:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):609:616 -> c
+    18:18:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):677:677 -> c
+    19:19:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):755:755 -> c
+    20:20:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):655:655 -> c
+    20:20:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):755 -> c
+    21:21:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):756:756 -> c
+    22:22:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):923:923 -> c
+    22:22:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1530 -> c
+    23:54:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1534:1565 -> c
     55:55:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    55:55:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1563 -> c
-    56:60:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1567:1571 -> c
-    61:66:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1568:1573 -> c
-    67:67:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):571:571 -> c
-    67:67:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1573 -> c
-    68:71:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1577:1580 -> c
-    72:74:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1714:1716 -> c
-    72:74:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1580 -> c
+    55:55:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1565 -> c
+    56:60:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1569:1573 -> c
+    61:66:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1570:1575 -> c
+    67:67:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):573:573 -> c
+    67:67:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1575 -> c
+    68:71:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1579:1582 -> c
+    72:74:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1716:1718 -> c
+    72:74:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1582 -> c
     75:75:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> c
-    75:75:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2670 -> c
-    75:75:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1583 -> c
-    76:76:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2670:2670 -> c
-    76:76:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1583 -> c
-    77:77:boolean registerReflectiveFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):933:933 -> c
-    78:78:void lambda$traceInstanceOf$12(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):1218:1218 -> c
-    79:79:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1223:1223 -> c
-    80:80:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1214:1214 -> c
-    80:80:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1224 -> c
-    81:87:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1228:1234 -> c
+    75:75:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2672 -> c
+    75:75:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1585 -> c
+    76:76:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2672:2672 -> c
+    76:76:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1585 -> c
+    77:77:boolean registerReflectiveFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):935:935 -> c
+    78:78:void lambda$traceInstanceOf$12(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):1220:1220 -> c
+    79:79:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1225:1225 -> c
+    80:80:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1216:1216 -> c
+    80:80:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1226 -> c
+    81:87:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1230:1236 -> c
     88:88:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> c
-    88:88:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1238 -> c
+    88:88:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1240 -> c
     89:89:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):50:50 -> c
     89:89:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> c
-    89:89:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1238 -> c
-    90:90:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1238:1238 -> c
-    91:115:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1303:1327 -> c
+    89:89:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1240 -> c
+    90:90:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1240:1240 -> c
+    91:115:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1305:1329 -> c
     116:116:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    116:116:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1327 -> c
-    117:121:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2020:2024 -> c
-    117:121:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2047 -> c
-    117:121:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1329 -> c
-    122:125:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2023:2026 -> c
-    122:125:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2047 -> c
-    122:125:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1329 -> c
-    126:140:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2048:2062 -> c
-    126:140:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1329 -> c
-    141:141:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1330:1330 -> c
-    142:142:void lambda$traceInvokeStatic$19(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1330:1330 -> c
-    143:143:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$26(com.android.tools.r8.graph.DexType):1729:1729 -> c
-    144:150:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2293:2293 -> c
-    156:169:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2299:2312 -> c
+    116:116:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1329 -> c
+    117:121:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2022:2026 -> c
+    117:121:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2049 -> c
+    117:121:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1331 -> c
+    122:125:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2025:2028 -> c
+    122:125:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2049 -> c
+    122:125:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1331 -> c
+    126:140:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2050:2064 -> c
+    126:140:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1331 -> c
+    141:141:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1332:1332 -> c
+    142:142:void lambda$traceInvokeStatic$19(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1332:1332 -> c
+    143:143:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$26(com.android.tools.r8.graph.DexType):1731:1731 -> c
+    144:150:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2295:2295 -> c
+    156:169:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2301:2314 -> c
     170:170:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):298:298 -> c
-    170:170:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2312 -> c
-    171:173:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2313:2315 -> c
-    174:175:boolean isFieldRead(com.android.tools.r8.graph.ProgramField):2778:2779 -> c
-    176:176:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2832:2832 -> c
-    177:177:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2828:2828 -> c
-    177:177:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2832 -> c
-    178:182:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3010:3014 -> c
-    178:182:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3022 -> c
-    183:188:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3013:3018 -> c
-    183:188:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3022 -> c
-    189:194:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3022:3027 -> c
-    195:195:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2251:2251 -> c
-    195:195:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3030 -> c
-    196:196:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():595:595 -> c
-    196:196:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2251 -> c
-    196:196:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3030 -> c
-    197:197:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2252:2252 -> c
-    197:197:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3030 -> c
-    198:198:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$markSuperMethodAsReachable$66(com.android.tools.r8.graph.DexEncodedMethod):3067:3067 -> c
-    199:204:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3211:3216 -> c
+    170:170:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2314 -> c
+    171:173:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2315:2317 -> c
+    174:175:boolean isFieldRead(com.android.tools.r8.graph.ProgramField):2780:2781 -> c
+    176:176:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2834:2834 -> c
+    177:177:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2830:2830 -> c
+    177:177:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2834 -> c
+    178:182:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3012:3016 -> c
+    178:182:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3024 -> c
+    183:188:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3015:3020 -> c
+    183:188:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3024 -> c
+    189:194:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3024:3029 -> c
+    195:195:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2253:2253 -> c
+    195:195:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3032 -> c
+    196:196:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():601:601 -> c
+    196:196:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2253 -> c
+    196:196:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3032 -> c
+    197:197:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2254:2254 -> c
+    197:197:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3032 -> c
+    198:198:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$markSuperMethodAsReachable$66(com.android.tools.r8.graph.DexEncodedMethod):3069:3069 -> c
+    199:204:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3213:3218 -> c
     205:205:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):113:113 -> c
-    205:205:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3216 -> c
-    206:206:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):503:503 -> c
+    205:205:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3218 -> c
+    206:206:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):507:507 -> c
     206:206:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):113 -> c
-    206:206:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3216 -> c
-    207:207:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3218:3218 -> c
+    206:206:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3218 -> c
+    207:207:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3220:3220 -> c
     208:208:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> c
-    208:208:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3218 -> c
-    209:209:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3219:3219 -> c
-    210:215:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3256:3261 -> c
+    208:208:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3220 -> c
+    209:209:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3221:3221 -> c
+    210:215:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3258:3263 -> c
     216:216:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):113:113 -> c
-    216:216:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3261 -> c
-    217:217:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):503:503 -> c
+    216:216:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3263 -> c
+    217:217:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):507:507 -> c
     217:217:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):113 -> c
-    217:217:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3261 -> c
-    218:218:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3263:3263 -> c
+    217:217:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3263 -> c
+    218:218:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3265:3265 -> c
     219:219:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> c
-    219:219:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3263 -> c
-    220:220:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3264:3264 -> c
-    221:226:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3311:3316 -> c
+    219:219:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3265 -> c
+    220:220:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3266:3266 -> c
+    221:226:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3313:3318 -> c
     227:227:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):113:113 -> c
-    227:227:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3316 -> c
-    228:228:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):503:503 -> c
+    227:227:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3318 -> c
+    228:228:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):507:507 -> c
     228:228:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):113 -> c
-    228:228:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3316 -> c
-    229:229:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3319:3319 -> c
+    228:228:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3318 -> c
+    229:229:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3321:3321 -> c
     230:230:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> c
-    230:230:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3319 -> c
-    231:231:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3320:3320 -> c
-    232:238:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3744:3750 -> c
-    239:250:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3780:3791 -> c
-    239:250:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3750 -> c
-    251:251:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2836:2836 -> c
-    251:251:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3791 -> c
-    251:251:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3750 -> c
-    252:252:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3792:3792 -> c
-    252:252:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3750 -> c
-    253:255:boolean verifyReferencedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3800:3802 -> c
-    253:255:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3792 -> c
-    253:255:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3750 -> c
-    256:276:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4049:4069 -> c
+    230:230:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3321 -> c
+    231:231:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3322:3322 -> c
+    232:238:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3746:3752 -> c
+    239:250:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3782:3793 -> c
+    239:250:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3752 -> c
+    251:251:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2838:2838 -> c
+    251:251:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3793 -> c
+    251:251:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3752 -> c
+    252:252:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3794:3794 -> c
+    252:252:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3752 -> c
+    253:255:boolean verifyReferencedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3802:3804 -> c
+    253:255:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3794 -> c
+    253:255:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3752 -> c
+    256:276:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4063:4083 -> c
     1:1:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> d
-    1:1:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1273 -> d
+    1:1:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1275 -> d
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):50:50 -> d
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> d
-    2:2:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1273 -> d
-    3:3:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1273:1273 -> d
-    4:4:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$1900(com.android.tools.r8.shaking.Enqueuer):184:184 -> d
-    5:5:boolean addTargetedMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):579:579 -> d
-    5:5:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4177 -> d
-    6:13:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4182:4189 -> d
-    14:15:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4293:4294 -> d
-    14:15:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4190 -> d
+    2:2:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1275 -> d
+    3:3:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1275:1275 -> d
+    4:4:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$1900(com.android.tools.r8.shaking.Enqueuer):186:186 -> d
+    5:5:boolean addTargetedMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):581:581 -> d
+    5:5:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4191 -> d
+    6:13:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4196:4203 -> d
+    14:15:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4307:4308 -> d
+    14:15:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4204 -> d
     16:16:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.ProgramMethod):189:189 -> d
-    16:16:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4294 -> d
-    16:16:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4190 -> d
-    17:17:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4293:4293 -> d
-    17:17:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4190 -> d
-    18:18:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4193:4193 -> d
-    19:34:void enqueueAllIfNotShrinking():794:809 -> d
+    16:16:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4308 -> d
+    16:16:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4204 -> d
+    17:17:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4307:4307 -> d
+    17:17:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4204 -> d
+    18:18:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4207:4207 -> d
+    19:34:void enqueueAllIfNotShrinking():796:811 -> d
     35:35:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):298:298 -> d
-    35:35:void enqueueAllIfNotShrinking():809 -> d
-    36:44:void enqueueAllIfNotShrinking():809:817 -> d
-    45:45:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):929:929 -> d
-    45:45:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1596 -> d
-    46:72:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1600:1626 -> d
+    35:35:void enqueueAllIfNotShrinking():811 -> d
+    36:44:void enqueueAllIfNotShrinking():811:819 -> d
+    45:45:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):931:931 -> d
+    45:45:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1598 -> d
+    46:72:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1602:1628 -> d
     73:73:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    73:73:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1626 -> d
-    74:80:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1629:1635 -> d
-    81:86:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1632:1637 -> d
-    87:87:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):571:571 -> d
-    87:87:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1637 -> d
-    88:91:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1642:1645 -> d
-    92:94:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1714:1716 -> d
-    92:94:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1645 -> d
+    73:73:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1628 -> d
+    74:80:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1631:1637 -> d
+    81:86:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1634:1639 -> d
+    87:87:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):573:573 -> d
+    87:87:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1639 -> d
+    88:91:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1644:1647 -> d
+    92:94:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1716:1718 -> d
+    92:94:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1647 -> d
     95:95:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> d
-    95:95:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2670 -> d
-    95:95:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1648 -> d
-    96:96:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2670:2670 -> d
-    96:96:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1648 -> d
-    97:97:void lambda$traceSafeCheckCast$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1038:1038 -> d
-    98:109:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1131:1142 -> d
-    110:138:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1141:1169 -> d
+    95:95:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2672 -> d
+    95:95:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1650 -> d
+    96:96:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2672:2672 -> d
+    96:96:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1650 -> d
+    97:97:void lambda$traceSafeCheckCast$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1040:1040 -> d
+    98:109:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1133:1144 -> d
+    110:138:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1143:1171 -> d
     139:139:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> d
-    139:139:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1173 -> d
-    140:140:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1173:1173 -> d
+    139:139:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1175 -> d
+    140:140:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1175:1175 -> d
     141:141:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> d
-    141:141:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1174 -> d
-    142:142:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1174:1174 -> d
-    143:143:void lambda$traceInvokeSuper$20(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1345:1345 -> d
-    144:151:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1358:1365 -> d
-    152:164:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1360:1372 -> d
+    141:141:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1176 -> d
+    142:142:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1176:1176 -> d
+    143:143:void lambda$traceInvokeSuper$20(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1347:1347 -> d
+    144:151:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1360:1367 -> d
+    152:164:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1362:1374 -> d
     165:165:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    165:165:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1372 -> d
-    166:167:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1374:1375 -> d
-    168:168:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1415:1415 -> d
-    169:177:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):1682:1690 -> d
-    178:178:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1721:1721 -> d
-    178:178:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):1694 -> d
-    179:183:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1725:1729 -> d
-    184:186:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1728:1730 -> d
-    187:187:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1726:1726 -> d
-    188:188:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$27(com.android.tools.r8.graph.DexType):1796:1796 -> d
-    189:193:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2789:2793 -> d
+    165:165:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1374 -> d
+    166:167:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1376:1377 -> d
+    168:168:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1417:1417 -> d
+    169:177:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):1684:1692 -> d
+    178:178:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1723:1723 -> d
+    178:178:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):1696 -> d
+    179:183:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1727:1731 -> d
+    184:186:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1730:1732 -> d
+    187:187:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1728:1728 -> d
+    188:188:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$27(com.android.tools.r8.graph.DexType):1798:1798 -> d
+    189:193:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2791:2795 -> d
     194:194:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():791:791 -> d
-    194:194:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2793 -> d
-    195:196:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2795:2796 -> d
-    197:197:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2840:2840 -> d
-    198:198:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2836:2836 -> d
-    198:198:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2840 -> d
-    199:199:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2850:2850 -> d
-    200:204:java.util.Set toDescriptorSet(java.util.Set):3809:3813 -> d
+    194:194:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2795 -> d
+    195:196:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2797:2798 -> d
+    197:197:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2842:2842 -> d
+    198:198:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2838:2838 -> d
+    198:198:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2842 -> d
+    199:199:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2852:2852 -> d
+    200:204:java.util.Set toDescriptorSet(java.util.Set):3811:3815 -> d
     1:1:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> e
-    1:1:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1294 -> e
+    1:1:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1296 -> e
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):50:50 -> e
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> e
-    2:2:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1294 -> e
-    3:3:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1294:1294 -> e
+    2:2:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1296 -> e
+    3:3:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1296:1296 -> e
     4:4:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> e
-    4:4:com.android.tools.r8.shaking.KeepReason lambda$handleReflectiveBehavior$97(com.android.tools.r8.graph.ProgramMethod):4354 -> e
-    5:5:com.android.tools.r8.utils.InternalOptions access$2100(com.android.tools.r8.shaking.Enqueuer):184:184 -> e
-    6:6:com.android.tools.r8.shaking.GraphReporter getGraphReporter():511:511 -> e
-    7:7:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):593:593 -> e
-    8:8:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1218:1218 -> e
-    9:9:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1214:1214 -> e
-    9:9:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1219 -> e
-    10:10:void lambda$traceInvokeVirtual$21(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1375:1375 -> e
-    11:11:void traceInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1419:1419 -> e
-    12:12:java.util.Map lambda$processAnnotation$37(com.android.tools.r8.graph.DexType):1971:1971 -> e
-    13:15:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2726:2728 -> e
-    16:17:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2754:2755 -> e
+    4:4:com.android.tools.r8.shaking.KeepReason lambda$handleReflectiveBehavior$98(com.android.tools.r8.graph.ProgramMethod):4368 -> e
+    5:5:com.android.tools.r8.utils.InternalOptions access$2100(com.android.tools.r8.shaking.Enqueuer):186:186 -> e
+    6:6:com.android.tools.r8.shaking.GraphReporter getGraphReporter():513:513 -> e
+    7:7:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):595:595 -> e
+    8:8:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1220:1220 -> e
+    9:9:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1216:1216 -> e
+    9:9:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1221 -> e
+    10:10:void lambda$traceInvokeVirtual$21(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1377:1377 -> e
+    11:11:void traceInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1421:1421 -> e
+    12:12:java.util.Map lambda$processAnnotation$37(com.android.tools.r8.graph.DexType):1973:1973 -> e
+    13:15:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2728:2730 -> e
+    16:17:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2756:2757 -> e
     18:18:boolean com.android.tools.r8.shaking.KeepReason.isDueToReflectiveUse():0:0 -> e
-    18:18:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2756 -> e
-    19:22:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2754:2757 -> e
-    23:26:java.util.Set lambda$createEnqueuerResult$87(com.android.tools.r8.graph.DexProgramClass):3668:3671 -> e
-    1:1:com.android.tools.r8.shaking.Enqueuer$Mode access$300(com.android.tools.r8.shaking.Enqueuer):184:184 -> f
-    2:2:com.android.tools.r8.shaking.Enqueuer$Mode getMode():507:507 -> f
-    3:3:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):583:583 -> f
-    4:4:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2276:2276 -> f
-    4:4:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):585 -> f
-    5:7:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):586:588 -> f
-    8:12:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,java.util.function.BiConsumer):681:685 -> f
-    8:12:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):587 -> f
-    13:21:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1379:1387 -> f
+    18:18:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2758 -> e
+    19:22:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2756:2759 -> e
+    23:26:java.util.Set lambda$createEnqueuerResult$87(com.android.tools.r8.graph.DexProgramClass):3670:3673 -> e
+    1:1:com.android.tools.r8.shaking.Enqueuer$Mode access$300(com.android.tools.r8.shaking.Enqueuer):186:186 -> f
+    2:2:com.android.tools.r8.shaking.Enqueuer$Mode getMode():509:509 -> f
+    3:3:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):585:585 -> f
+    4:4:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2278:2278 -> f
+    4:4:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):587 -> f
+    5:7:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):588:590 -> f
+    8:12:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,java.util.function.BiConsumer):683:687 -> f
+    8:12:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):589 -> f
+    13:21:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1381:1389 -> f
     22:22:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.ProgramMethod):34:34 -> f
-    22:22:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1391 -> f
-    23:23:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1387:1387 -> f
-    24:24:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1467:1467 -> f
-    25:35:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1652:1662 -> f
-    25:35:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1336 -> f
-    36:41:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1337:1342 -> f
+    22:22:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1393 -> f
+    23:23:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1389:1389 -> f
+    24:24:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1469:1469 -> f
+    25:35:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1654:1664 -> f
+    25:35:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1338 -> f
+    36:41:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1339:1344 -> f
     42:42:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> f
-    42:42:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1342 -> f
-    43:44:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1344:1345 -> f
-    45:45:com.android.tools.r8.utils.collections.ProgramFieldSet lambda$markFieldAsReachable$53(com.android.tools.r8.graph.DexProgramClass):2713:2713 -> f
-    46:47:void lambda$markDirectStaticOrConstructorMethodAsLive$55(com.android.tools.r8.graph.ProgramMethod):2743:2744 -> f
+    42:42:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1344 -> f
+    43:44:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1346:1347 -> f
+    45:45:com.android.tools.r8.utils.collections.ProgramFieldSet lambda$markFieldAsReachable$53(com.android.tools.r8.graph.DexProgramClass):2715:2715 -> f
+    46:47:void lambda$markDirectStaticOrConstructorMethodAsLive$55(com.android.tools.r8.graph.ProgramMethod):2745:2746 -> f
     1:1:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> g
-    1:1:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1349 -> g
+    1:1:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1351 -> g
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):50:50 -> g
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> g
-    2:2:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1349 -> g
-    3:3:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1349:1349 -> g
-    4:4:com.android.tools.r8.shaking.GraphReporter access$400(com.android.tools.r8.shaking.Enqueuer):184:184 -> g
-    5:5:void traceSafeCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1038:1038 -> g
-    6:6:void traceCompilerSynthesizedConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1110:1110 -> g
-    6:6:void traceSafeCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1039 -> g
-    7:7:void traceInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1471:1471 -> g
-    8:8:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$36(com.android.tools.r8.graph.DexProgramClass):1917:1917 -> g
-    9:9:void lambda$markDirectStaticOrConstructorMethodAsLive$56(com.android.tools.r8.graph.ProgramMethod):2748:2748 -> g
-    10:12:long getNumberOfLiveItems():3965:3967 -> g
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist access$500(com.android.tools.r8.shaking.Enqueuer):184:184 -> h
-    2:2:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getUseRegistryFactory():523:523 -> h
-    3:3:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1214:1214 -> h
-    4:4:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1519:1519 -> h
-    5:16:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2067:2078 -> h
-    17:23:boolean markDirectClassInitializerAsLive(com.android.tools.r8.graph.DexProgramClass):2099:2105 -> h
-    17:23:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2082 -> h
-    24:27:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2088:2091 -> h
-    28:32:void traceCode(com.android.tools.r8.graph.ProgramMethod):4220:4224 -> h
-    1:1:com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet access$600(com.android.tools.r8.shaking.Enqueuer):184:184 -> i
-    2:2:void traceStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1523:1523 -> i
-    3:18:void markInterfaceInitializedDirectly(com.android.tools.r8.graph.DexProgramClass):2115:2130 -> i
-    19:22:void postProcessingDesugaring():3930:3933 -> i
+    2:2:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1351 -> g
+    3:3:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1351:1351 -> g
+    4:4:com.android.tools.r8.shaking.GraphReporter access$400(com.android.tools.r8.shaking.Enqueuer):186:186 -> g
+    5:5:void traceSafeCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1040:1040 -> g
+    6:6:void traceCompilerSynthesizedConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1112:1112 -> g
+    6:6:void traceSafeCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1041 -> g
+    7:7:void traceInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1473:1473 -> g
+    8:8:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$36(com.android.tools.r8.graph.DexProgramClass):1919:1919 -> g
+    9:9:void lambda$markDirectStaticOrConstructorMethodAsLive$56(com.android.tools.r8.graph.ProgramMethod):2750:2750 -> g
+    10:12:long getNumberOfLiveItems():3979:3981 -> g
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist access$500(com.android.tools.r8.shaking.Enqueuer):186:186 -> h
+    2:2:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getUseRegistryFactory():525:525 -> h
+    3:3:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1216:1216 -> h
+    4:4:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1521:1521 -> h
+    5:16:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2069:2080 -> h
+    17:23:boolean markDirectClassInitializerAsLive(com.android.tools.r8.graph.DexProgramClass):2101:2107 -> h
+    17:23:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2084 -> h
+    24:27:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2090:2093 -> h
+    28:32:void traceCode(com.android.tools.r8.graph.ProgramMethod):4234:4238 -> h
+    1:1:com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet access$600(com.android.tools.r8.shaking.Enqueuer):186:186 -> i
+    2:2:void traceStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1525:1525 -> i
+    3:18:void markInterfaceInitializedDirectly(com.android.tools.r8.graph.DexProgramClass):2117:2132 -> i
+    19:22:void postProcessingDesugaring():3932:3935 -> i
     23:23:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():316:316 -> i
-    23:23:void postProcessingDesugaring():3933 -> i
-    24:32:void postProcessingDesugaring():3933:3941 -> i
-    33:36:void postProcessingDesugaring():3940:3943 -> i
-    37:53:void postProcessingDesugaring():3942:3958 -> i
-    54:54:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():316:316 -> i
-    54:54:void postProcessingDesugaring():3958 -> i
-    55:55:void postProcessingDesugaring():3959:3959 -> i
-    56:56:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():320:320 -> i
-    56:56:void postProcessingDesugaring():3959 -> i
-    57:57:void postProcessingDesugaring():3960:3960 -> i
-    58:58:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4228:4228 -> i
-    58:58:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4197 -> i
-    59:62:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4233:4236 -> i
-    59:62:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4229 -> i
-    59:62:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4197 -> i
-    63:71:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4198:4206 -> i
-    1:1:java.util.Set access$800(com.android.tools.r8.shaking.Enqueuer):184:184 -> j
-    2:2:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1587:1587 -> j
-    3:5:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1670:1672 -> j
-    6:23:boolean markInterfaceInitializedIndirectly(com.android.tools.r8.graph.DexProgramClass):2140:2157 -> j
-    24:31:void synthesize():3451:3458 -> j
-    32:37:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3586:3591 -> j
-    32:37:void synthesize():3459 -> j
-    38:49:void synthesize():3460:3471 -> j
-    1:1:com.android.tools.r8.shaking.RootSetUtils$RootSet access$900(com.android.tools.r8.shaking.Enqueuer):184:184 -> k
-    2:2:void traceStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1591:1591 -> k
-    3:36:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2617:2650 -> k
-    1:4:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2657:2660 -> l
-    5:5:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1721:1721 -> l
-    5:5:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2661 -> l
-    6:6:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2665:2665 -> l
-    1:1:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1677:1677 -> m
+    23:23:void postProcessingDesugaring():3935 -> i
+    24:44:void postProcessingDesugaring():3935:3955 -> i
+    45:48:void postProcessingDesugaring():3954:3957 -> i
+    49:65:void postProcessingDesugaring():3956:3972 -> i
+    66:66:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():316:316 -> i
+    66:66:void postProcessingDesugaring():3972 -> i
+    67:67:void postProcessingDesugaring():3973:3973 -> i
+    68:68:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():320:320 -> i
+    68:68:void postProcessingDesugaring():3973 -> i
+    69:69:void postProcessingDesugaring():3974:3974 -> i
+    70:70:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4242:4242 -> i
+    70:70:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4211 -> i
+    71:74:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4247:4250 -> i
+    71:74:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4243 -> i
+    71:74:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4211 -> i
+    75:83:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4212:4220 -> i
+    1:1:java.util.Set access$800(com.android.tools.r8.shaking.Enqueuer):186:186 -> j
+    2:2:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1589:1589 -> j
+    3:5:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1672:1674 -> j
+    6:23:boolean markInterfaceInitializedIndirectly(com.android.tools.r8.graph.DexProgramClass):2142:2159 -> j
+    24:31:void synthesize():3453:3460 -> j
+    32:37:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3588:3593 -> j
+    32:37:void synthesize():3461 -> j
+    38:49:void synthesize():3462:3473 -> j
+    1:1:com.android.tools.r8.shaking.RootSetUtils$RootSet access$900(com.android.tools.r8.shaking.Enqueuer):186:186 -> k
+    2:2:void traceStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1593:1593 -> k
+    3:36:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2619:2652 -> k
+    1:4:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2659:2662 -> l
+    5:5:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1723:1723 -> l
+    5:5:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2663 -> l
+    6:6:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2667:2667 -> l
+    1:1:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1679:1679 -> m
 com.android.tools.r8.shaking.Enqueuer$1 -> com.android.tools.r8.shaking.t:
 com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker -> com.android.tools.r8.shaking.u:
     com.android.tools.r8.shaking.KeepReason reason -> b
     com.android.tools.r8.shaking.Enqueuer this$0 -> c
     com.android.tools.r8.graph.ProgramDefinition context -> a
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer$1):4745:4745 -> <init>
-    2:4:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):4750:4752 -> <init>
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer$1):4759:4759 -> <init>
+    2:4:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):4764:4766 -> <init>
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> 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:2:boolean addField(com.android.tools.r8.graph.DexField):4762:4763 -> b
+    1:2:boolean addField(com.android.tools.r8.graph.DexField):4776:4777 -> b
     3:3:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):307:307 -> b
-    3:3:boolean addField(com.android.tools.r8.graph.DexField):4767 -> b
+    3:3:boolean addField(com.android.tools.r8.graph.DexField):4781 -> b
     4:4:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):316:316 -> b
     4:4:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):307 -> b
-    4:4:boolean addField(com.android.tools.r8.graph.DexField):4767 -> b
-    5:8:boolean addField(com.android.tools.r8.graph.DexField):4772:4775 -> b
-    9:9:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():242:242 -> b
-    9:9:boolean addField(com.android.tools.r8.graph.DexField):4775 -> b
-    10:18:boolean addField(com.android.tools.r8.graph.DexField):4777:4785 -> b
-    19:19:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> b
-    19:19:boolean addField(com.android.tools.r8.graph.DexField):4785 -> b
-    20:25:boolean addField(com.android.tools.r8.graph.DexField):4785:4790 -> b
-    26:41:boolean addMethod(com.android.tools.r8.graph.DexMethod):4798:4813 -> b
-    42:42:boolean addType(com.android.tools.r8.graph.DexType):4841:4841 -> b
+    4:4:boolean addField(com.android.tools.r8.graph.DexField):4781 -> b
+    5:8:boolean addField(com.android.tools.r8.graph.DexField):4786:4789 -> b
+    9:9:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():208:208 -> b
+    9:9:boolean addField(com.android.tools.r8.graph.DexField):4789 -> b
+    10:18:boolean addField(com.android.tools.r8.graph.DexField):4791:4799 -> b
+    19:19:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> b
+    19:19:boolean addField(com.android.tools.r8.graph.DexField):4799 -> b
+    20:25:boolean addField(com.android.tools.r8.graph.DexField):4799:4804 -> b
+    26:41:boolean addMethod(com.android.tools.r8.graph.DexMethod):4812:4827 -> b
+    42:42:boolean addType(com.android.tools.r8.graph.DexType):4855:4855 -> b
 com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier -> com.android.tools.r8.shaking.v:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> a
-    1:2:void <init>(com.android.tools.r8.shaking.Enqueuer):4850:4851 -> <init>
-    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):4855:4855 -> a
-    2:2:void lambda$definitionFor$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):4855:4855 -> a
+    1:2:void <init>(com.android.tools.r8.shaking.Enqueuer):4864:4865 -> <init>
+    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):4869:4869 -> a
+    2:2:void lambda$definitionFor$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):4869:4869 -> a
 com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet -> com.android.tools.r8.shaking.w:
     com.android.tools.r8.shaking.Enqueuer this$0 -> c
     java.util.Set fields -> a
     java.util.function.BiConsumer register -> b
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4695:4695 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4691:4696 -> <init>
-    1:1:java.util.Set access$1500(com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet):4689:4689 -> a
-    2:5:boolean add(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4700:4703 -> a
-    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedField):4707:4707 -> a
-    7:7:boolean contains(com.android.tools.r8.graph.ProgramField):4711:4711 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedField):4707:4707 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.ProgramField):4711 -> a
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4709:4709 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4705:4710 -> <init>
+    1:1:java.util.Set access$1500(com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet):4703:4703 -> a
+    2:5:boolean add(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4714:4717 -> a
+    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedField):4721:4721 -> a
+    7:7:boolean contains(com.android.tools.r8.graph.ProgramField):4725:4725 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedField):4721:4721 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.ProgramField):4725 -> a
 com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet -> com.android.tools.r8.shaking.x:
     com.android.tools.r8.shaking.Enqueuer this$0 -> c
     java.util.Set items -> a
     java.util.function.BiConsumer register -> b
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4721:4721 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4717:4722 -> <init>
-    1:1:java.util.Set access$1400(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):4715:4715 -> a
-    2:5:boolean add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4726:4729 -> a
-    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4733:4733 -> a
-    7:7:boolean contains(com.android.tools.r8.graph.ProgramMethod):4737:4737 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4733:4733 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.ProgramMethod):4737 -> a
-    9:9:java.util.Set getItems():4741:4741 -> a
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4735:4735 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4731:4736 -> <init>
+    1:1:java.util.Set access$1400(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):4729:4729 -> a
+    2:5:boolean add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4740:4743 -> a
+    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4747:4747 -> a
+    7:7:boolean contains(com.android.tools.r8.graph.ProgramMethod):4751:4751 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4747:4747 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.ProgramMethod):4751 -> a
+    9:9:java.util.Set getItems():4755:4755 -> a
 com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.shaking.y$a:
     com.android.tools.r8.shaking.Enqueuer$Mode GENERATE_MAIN_DEX_LIST -> e
     com.android.tools.r8.shaking.Enqueuer$Mode FINAL_MAIN_DEX_TRACING -> d
@@ -121430,40 +121690,40 @@ com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.shaking.y$a:
     com.android.tools.r8.shaking.Enqueuer$Mode FINAL_TREE_SHAKING -> b
     com.android.tools.r8.shaking.Enqueuer$Mode WHY_ARE_YOU_KEEPING -> f
     com.android.tools.r8.shaking.Enqueuer$Mode INITIAL_TREE_SHAKING -> a
-    1:6:void <clinit>():187:192 -> <clinit>
-    1:1:void <init>(java.lang.String,int):186:186 -> <init>
-    1:1:boolean isFinalTreeShaking():203:203 -> a
-    1:1:boolean isInitialOrFinalTreeShaking():207:207 -> b
-    1:1:boolean isInitialTreeShaking():199:199 -> c
-    1:1:boolean isInitialMainDexTracing():211:211 -> d
-    1:1:boolean isMainDexTracing():223 -> d
-    2:2:boolean isFinalMainDexTracing():215:215 -> d
-    2:2:boolean isMainDexTracing():223 -> d
-    3:3:boolean isGenerateMainDexList():219:219 -> d
-    3:3:boolean isMainDexTracing():223 -> d
-    1:1:boolean isTreeShaking():195:195 -> e
+    1:6:void <clinit>():189:194 -> <clinit>
+    1:1:void <init>(java.lang.String,int):188:188 -> <init>
+    1:1:boolean isFinalTreeShaking():205:205 -> a
+    1:1:boolean isInitialOrFinalTreeShaking():209:209 -> b
+    1:1:boolean isInitialTreeShaking():201:201 -> c
+    1:1:boolean isInitialMainDexTracing():213:213 -> d
+    1:1:boolean isMainDexTracing():225 -> d
+    2:2:boolean isFinalMainDexTracing():217:217 -> d
+    2:2:boolean isMainDexTracing():225 -> d
+    3:3:boolean isGenerateMainDexList():221:221 -> d
+    3:3:boolean isMainDexTracing():225 -> d
+    1:1:boolean isTreeShaking():197:197 -> e
 com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey -> com.android.tools.r8.shaking.z:
     boolean isInterface -> b
     com.android.tools.r8.graph.DexMethod method -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.Enqueuer$1):4859:4859 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexMethod,boolean):4864:4866 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethod access$2800(com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey):4859:4859 -> a
-    1:1:boolean access$2900(com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey):4859:4859 -> b
-    1:5:boolean equals(java.lang.Object):4871:4875 -> equals
-    1:1:int hashCode():4880:4880 -> hashCode
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.Enqueuer$1):4873:4873 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexMethod,boolean):4878:4880 -> <init>
+    1:1:com.android.tools.r8.graph.DexMethod access$2800(com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey):4873:4873 -> a
+    1:1:boolean access$2900(com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey):4873:4873 -> b
+    1:5:boolean equals(java.lang.Object):4885:4889 -> equals
+    1:1:int hashCode():4894:4894 -> hashCode
 com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason -> com.android.tools.r8.shaking.A:
     java.util.Map deferredActions -> b
     java.util.Set items -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():4658:4658 -> <clinit>
-    1:4:void <init>():4658:4661 -> <init>
-    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):4658:4658 -> <init>
-    1:1:java.util.Set access$1300(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):4658:4658 -> a
-    2:4:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):4664:4666 -> a
-    5:5:boolean contains(java.lang.Object):4673:4673 -> a
-    6:7:boolean registerDeferredAction(java.lang.Object,com.android.tools.r8.utils.Action):4677:4678 -> a
-    8:8:java.util.Set getItems():4685:4685 -> a
-    1:1:java.util.List lambda$registerDeferredAction$0(java.lang.Object):4678:4678 -> b
+    1:1:void <clinit>():4672:4672 -> <clinit>
+    1:4:void <init>():4672:4675 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):4672:4672 -> <init>
+    1:1:java.util.Set access$1300(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):4672:4672 -> a
+    2:4:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):4678:4680 -> a
+    5:5:boolean contains(java.lang.Object):4687:4687 -> a
+    6:7:boolean registerDeferredAction(java.lang.Object,com.android.tools.r8.utils.Action):4691:4692 -> a
+    8:8:java.util.Set getItems():4699:4699 -> a
+    1:1:java.util.List lambda$registerDeferredAction$0(java.lang.Object):4692:4692 -> b
 com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions -> com.android.tools.r8.shaking.B:
     java.util.Map methodProcessingContexts -> b
     java.util.Map liveMethods -> d
@@ -121474,32 +121734,32 @@ com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions -> com.android.tools.r8
     java.util.Map syntheticClasspathClasses -> f
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> a
     java.util.Map injectedInterfaces -> g
-    1:1:void <clinit>():3340:3340 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):3362:3362 -> <init>
-    2:22:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):3343:3363 -> <init>
-    1:1:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext lambda$getMethodContext$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):3368:3368 -> a
-    2:7:boolean isEmpty():3372:3377 -> a
-    8:9:void addLiveClasspathClass(com.android.tools.r8.graph.DexClasspathClass):3382:3383 -> a
-    10:12:void addLiveMethod(com.android.tools.r8.graph.ProgramMethod):3391:3393 -> a
-    13:15:void injectInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass):3401:3403 -> a
-    16:16:java.util.Set lambda$injectInterface$1(com.android.tools.r8.graph.DexProgramClass):3402:3402 -> a
-    17:20:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3423:3426 -> a
+    1:1:void <clinit>():3342:3342 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):3364:3364 -> <init>
+    2:22:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):3345:3365 -> <init>
+    1:1:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext lambda$getMethodContext$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):3370:3370 -> a
+    2:7:boolean isEmpty():3374:3379 -> a
+    8:9:void addLiveClasspathClass(com.android.tools.r8.graph.DexClasspathClass):3384:3385 -> a
+    10:12:void addLiveMethod(com.android.tools.r8.graph.ProgramMethod):3393:3395 -> a
+    13:15:void injectInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass):3403:3405 -> a
+    16:16:java.util.Set lambda$injectInterface$1(com.android.tools.r8.graph.DexProgramClass):3404:3404 -> a
+    17:20:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3425:3428 -> a
     21:21:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.fakeReportShouldNotBeUsed():71:71 -> a
-    21:21:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3426 -> a
-    22:40:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3428:3446 -> a
-    41:41:void lambda$enqueueWorkItems$2(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Pair):3433:3433 -> a
-    42:44:void lambda$enqueueWorkItems$3(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,java.util.Set):3442:3442 -> a
-    45:45:void lambda$enqueueWorkItems$4(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod):3446:3446 -> a
-    1:1:void addMethodWithDesugaredCodeForTracing(com.android.tools.r8.graph.ProgramMethod):3397:3397 -> b
-    1:1:void addNeverInlineMethod(com.android.tools.r8.graph.ProgramMethod):3419:3419 -> c
-    1:3:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext getMethodContext(com.android.tools.r8.graph.ProgramMethod):3367:3367 -> d
-com.android.tools.r8.shaking.EnqueuerEvent -> com.android.tools.r8.internal.sN0:
+    21:21:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3428 -> a
+    22:40:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3430:3448 -> a
+    41:41:void lambda$enqueueWorkItems$2(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Pair):3435:3435 -> a
+    42:44:void lambda$enqueueWorkItems$3(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,java.util.Set):3444:3444 -> a
+    45:45:void lambda$enqueueWorkItems$4(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod):3448:3448 -> a
+    1:1:void addMethodWithDesugaredCodeForTracing(com.android.tools.r8.graph.ProgramMethod):3399:3399 -> b
+    1:1:void addNeverInlineMethod(com.android.tools.r8.graph.ProgramMethod):3421:3421 -> c
+    1:3:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext getMethodContext(com.android.tools.r8.graph.ProgramMethod):3369:3369 -> d
+com.android.tools.r8.shaking.EnqueuerEvent -> com.android.tools.r8.internal.vN0:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.shaking.EnqueuerEvent$ClassEnqueuerEvent asClassEvent() -> a
     com.android.tools.r8.graph.DexDefinition getDefinition(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens) -> a
     boolean isClassEvent() -> b
-com.android.tools.r8.shaking.EnqueuerEvent$ClassEnqueuerEvent -> com.android.tools.r8.internal.oN0:
+com.android.tools.r8.shaking.EnqueuerEvent$ClassEnqueuerEvent -> com.android.tools.r8.internal.rN0:
     com.android.tools.r8.graph.DexType clazz -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):53:54 -> <init>
     com.android.tools.r8.shaking.EnqueuerEvent$ClassEnqueuerEvent asClassEvent() -> a
@@ -121508,7 +121768,7 @@ com.android.tools.r8.shaking.EnqueuerEvent$ClassEnqueuerEvent -> com.android.too
     2:2:com.android.tools.r8.graph.DexDefinition getDefinition(com.android.tools.r8.graph.DexDefinitionSupplier):59:59 -> a
     boolean isClassEvent() -> b
     1:1:com.android.tools.r8.graph.DexType getType():63:63 -> c
-com.android.tools.r8.shaking.EnqueuerEvent$InstantiatedClassEnqueuerEvent -> com.android.tools.r8.internal.pN0:
+com.android.tools.r8.shaking.EnqueuerEvent$InstantiatedClassEnqueuerEvent -> com.android.tools.r8.internal.sN0:
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass):123:123 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexType):127:127 -> <init>
     1:1:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):142:142 -> a
@@ -121517,7 +121777,7 @@ com.android.tools.r8.shaking.EnqueuerEvent$InstantiatedClassEnqueuerEvent -> com
     3:3:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):142:142 -> a
     1:3:boolean equals(java.lang.Object):150:152 -> equals
     1:1:int hashCode():159:159 -> hashCode
-com.android.tools.r8.shaking.EnqueuerEvent$LiveClassEnqueuerEvent -> com.android.tools.r8.internal.qN0:
+com.android.tools.r8.shaking.EnqueuerEvent$LiveClassEnqueuerEvent -> com.android.tools.r8.internal.tN0:
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass):80:80 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexType):84:84 -> <init>
     1:1:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):99:99 -> a
@@ -121526,7 +121786,7 @@ com.android.tools.r8.shaking.EnqueuerEvent$LiveClassEnqueuerEvent -> com.android
     3:3:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):99:99 -> a
     1:3:boolean equals(java.lang.Object):107:109 -> equals
     1:1:int hashCode():116:116 -> hashCode
-com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent -> com.android.tools.r8.internal.rN0:
+com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent -> com.android.tools.r8.internal.uN0:
     com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent INSTANCE -> a
     1:1:void <clinit>():165:165 -> <clinit>
     1:1:void <init>():167:167 -> <init>
@@ -121540,13 +121800,13 @@ com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.shaking.C:
     1:1:com.android.tools.r8.shaking.Enqueuer createForInitialTreeShaking(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo):22:22 -> b
     2:2:com.android.tools.r8.shaking.Enqueuer createForGenerateMainDexList(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer):62:62 -> b
     1:1:com.android.tools.r8.shaking.Enqueuer createForWhyAreYouKeeping(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer):71:71 -> c
-com.android.tools.r8.shaking.EnqueuerMetadataTraceable -> com.android.tools.r8.internal.uN0:
+com.android.tools.r8.shaking.EnqueuerMetadataTraceable -> com.android.tools.r8.internal.xN0:
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
 com.android.tools.r8.shaking.EnqueuerResult -> com.android.tools.r8.shaking.D:
     com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> a
     1:2:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):11:12 -> <init>
     1:1:com.android.tools.r8.shaking.AppInfoWithLiveness getAppInfo():16:16 -> a
-com.android.tools.r8.shaking.EnqueuerUseRegistryFactory -> com.android.tools.r8.internal.vN0:
+com.android.tools.r8.shaking.EnqueuerUseRegistryFactory -> com.android.tools.r8.internal.yN0:
     com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer,java.util.function.BiFunction) -> a
 com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.shaking.Z:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> a
@@ -121577,7 +121837,7 @@ com.android.tools.r8.shaking.EnqueuerWorklist$AssertAction -> com.android.tools.
     com.android.tools.r8.utils.Action assertion -> a
     1:2:void <init>(com.android.tools.r8.utils.Action):32:33 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):38:38 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction -> com.android.tools.r8.internal.wN0:
+com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction -> com.android.tools.r8.internal.zN0:
     1:1:void <init>():25:25 -> <init>
     void run(com.android.tools.r8.shaking.Enqueuer) -> a
 com.android.tools.r8.shaking.EnqueuerWorklist$MarkAnnotationInstantiatedAction -> com.android.tools.r8.shaking.G:
@@ -121764,7 +122024,7 @@ com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$FieldAccessContex
     12:12:void addWriteContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):48 -> b
     13:13:void addWriteContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):48:48 -> b
     14:14:void recordWriteInUnknownContext():53:53 -> b
-com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.internal.mP0:
+com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.internal.pP0:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.nio.file.Path path -> a
@@ -121783,7 +122043,7 @@ com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.internal.
     1:1:boolean com.android.tools.r8.shaking.FilteredClassPath.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.GlobalKeepInfoConfiguration -> com.android.tools.r8.internal.SQ0:
+com.android.tools.r8.shaking.GlobalKeepInfoConfiguration -> com.android.tools.r8.internal.VQ0:
 com.android.tools.r8.shaking.GraphReporter -> com.android.tools.r8.shaking.f0:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map annotationNodes -> d
@@ -121983,7 +122243,7 @@ com.android.tools.r8.shaking.InlineRule$Builder -> com.android.tools.r8.shaking.
     1:1:void <init>(com.android.tools.r8.shaking.InlineRule$1):27:27 -> <init>
     2:2:void <init>():30:30 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.InlineRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.FT0:
+com.android.tools.r8.shaking.InlineRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.IT0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
@@ -122005,7 +122265,7 @@ com.android.tools.r8.shaking.InstantiatedObject$InstantiatedLambda -> com.androi
     com.android.tools.r8.ir.desugar.LambdaDescriptor lambdaDescriptor -> b
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaDescriptor):68:69 -> <init>
     1:1:com.android.tools.r8.ir.desugar.LambdaDescriptor asLambda():79:79 -> b
-com.android.tools.r8.shaking.InstantiationReason -> com.android.tools.r8.internal.qU0:
+com.android.tools.r8.shaking.InstantiationReason -> com.android.tools.r8.internal.tU0:
     com.android.tools.r8.shaking.InstantiationReason REFERENCED_IN_METHOD_HANDLE -> d
     com.android.tools.r8.shaking.InstantiationReason REFLECTION -> e
     com.android.tools.r8.shaking.InstantiationReason LAMBDA -> b
@@ -122129,70 +122389,62 @@ com.android.tools.r8.shaking.KeepInfo -> com.android.tools.r8.shaking.y0:
     2:2:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$newEmptyJoinerFor$0(com.android.tools.r8.graph.DexType):52:52 -> a
     3:3:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$newEmptyJoinerFor$1(com.android.tools.r8.graph.DexField):53:53 -> a
     4:4:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$newEmptyJoinerFor$2(com.android.tools.r8.graph.DexMethod):54:54 -> a
-    5:5:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):147:147 -> a
-    6:7:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():672:673 -> a
-    6:7:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):147 -> a
-    8:8:boolean internalIsAccessModificationAllowed():152:152 -> a
-    8:8:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):147 -> a
-    9:9:boolean internalIsAccessModificationAllowed():152:152 -> a
-    10:10:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):203:203 -> a
-    11:11:boolean internalIsAccessModificationAllowed():152:152 -> a
-    11:11:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):203 -> a
-    12:12:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):203:203 -> a
+    5:5:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):151:151 -> a
+    6:7:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():678:679 -> a
+    6:7:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):151 -> a
+    8:8:boolean internalIsAccessModificationAllowed():156:156 -> a
+    8:8:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):151 -> a
+    9:9:boolean internalIsAccessModificationAllowed():156:156 -> a
+    10:10:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):207:207 -> a
+    11:11:boolean internalIsAccessModificationAllowed():156:156 -> a
+    11:11:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):207 -> a
+    12:12:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):207:207 -> a
     13:13:boolean internalIsAnnotationRemovalAllowed():70:70 -> a
-    13:13:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):204 -> a
-    14:14:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):204:204 -> a
-    15:15:boolean internalIsMinificationAllowed():94:94 -> a
-    15:15:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):205 -> a
-    16:16:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):205:205 -> a
-    17:17:boolean internalIsOptimizationAllowed():108:108 -> a
-    17:17:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):206 -> a
-    18:18:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):206:206 -> a
-    19:19:boolean internalIsShrinkingAllowed():122:122 -> a
-    19:19:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):207 -> a
+    13:13:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):208 -> a
+    14:14:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):208:208 -> a
+    15:15:boolean internalIsMinificationAllowed():98:98 -> a
+    15:15:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):209 -> a
+    16:16:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):209:209 -> a
+    17:17:boolean internalIsOptimizationAllowed():112:112 -> a
+    17:17:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):210 -> a
+    18:18:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):210:210 -> a
+    19:19:boolean internalIsShrinkingAllowed():126:126 -> a
+    19:19:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):211 -> a
     1:1:boolean isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):66:66 -> b
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():610:610 -> b
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():585 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():616:616 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():591 -> b
     2:2:boolean isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):66 -> b
     3:3:boolean internalIsAnnotationRemovalAllowed():70:70 -> b
     3:3:boolean isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):66 -> b
-    4:4:boolean internalIsAccessModificationRequiredForRepackaging():135:135 -> b
+    4:4:boolean internalIsAccessModificationRequiredForRepackaging():139:139 -> b
     1:1:boolean internalIsAnnotationRemovalAllowed():70:70 -> c
-    2:2:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):176:176 -> c
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():610:610 -> c
-    3:3:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):179 -> c
-    4:4:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):179:179 -> c
-    1:1:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):90:90 -> d
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():595:595 -> d
-    2:2:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):90 -> d
-    3:3:boolean internalIsMinificationAllowed():94:94 -> d
-    3:3:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):90 -> d
-    4:4:boolean internalIsMinificationAllowed():94:94 -> d
-    1:1:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):104:104 -> e
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():600:600 -> e
-    2:2:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):104 -> e
-    3:3:boolean internalIsOptimizationAllowed():108:108 -> e
-    3:3:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):104 -> e
-    4:4:boolean internalIsOptimizationAllowed():108:108 -> e
-    1:1:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):104:104 -> f
-    1:1:boolean isPinned(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):80 -> f
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():600:600 -> f
-    2:2:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):104 -> f
-    2:2:boolean isPinned(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):80 -> f
-    3:3:boolean internalIsOptimizationAllowed():108:108 -> f
-    3:3:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):104 -> f
-    3:3:boolean isPinned(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):80 -> f
-    4:4:boolean isPinned(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):80:80 -> f
-    5:5:boolean internalIsShrinkingAllowed():122:122 -> f
-    1:1:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):118:118 -> g
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():590:590 -> g
-    2:2:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):118 -> g
-    3:3:boolean internalIsShrinkingAllowed():122:122 -> g
-    3:3:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):118 -> g
-    1:1:boolean isSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):156:156 -> h
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():610:610 -> h
-    2:2:boolean isSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):159 -> h
-    3:3:boolean isSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):159:159 -> h
+    2:2:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):180:180 -> c
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():616:616 -> c
+    3:3:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):183 -> c
+    4:4:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):183:183 -> c
+    1:1:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):94:94 -> d
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():601:601 -> d
+    2:2:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):94 -> d
+    3:3:boolean internalIsMinificationAllowed():98:98 -> d
+    3:3:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):94 -> d
+    4:4:boolean internalIsMinificationAllowed():98:98 -> d
+    1:1:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):108:108 -> e
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():606:606 -> e
+    2:2:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):108 -> e
+    3:3:boolean internalIsOptimizationAllowed():112:112 -> e
+    3:3:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):108 -> e
+    4:4:boolean internalIsOptimizationAllowed():112:112 -> e
+    1:1:boolean isPinned(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):84:84 -> f
+    2:2:boolean internalIsShrinkingAllowed():126:126 -> f
+    1:1:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):122:122 -> g
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():596:596 -> g
+    2:2:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):122 -> g
+    3:3:boolean internalIsShrinkingAllowed():126:126 -> g
+    3:3:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):122 -> g
+    1:1:boolean isSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):160:160 -> h
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():616:616 -> h
+    2:2:boolean isSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):163 -> h
+    3:3:boolean isSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):163:163 -> h
 com.android.tools.r8.shaking.KeepInfo$Builder -> com.android.tools.r8.shaking.w0:
     boolean allowOptimization -> e
     boolean allowShrinking -> f
@@ -122201,112 +122453,112 @@ com.android.tools.r8.shaking.KeepInfo$Builder -> com.android.tools.r8.shaking.w0
     boolean allowAccessModification -> b
     boolean allowAnnotationRemoval -> c
     boolean allowMinification -> d
-    1:1:void <init>():231:231 -> <init>
-    2:10:void <init>(com.android.tools.r8.shaking.KeepInfo):235:243 -> <init>
-    1:1:com.android.tools.r8.shaking.KeepInfo access$000(com.android.tools.r8.shaking.KeepInfo$Builder):211:211 -> a
-    2:13:com.android.tools.r8.shaking.KeepInfo build():267:278 -> a
-    14:14:boolean isAccessModificationAllowed():296:296 -> a
-    14:14:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):282 -> a
-    15:15:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):282:282 -> a
-    16:16:boolean isAnnotationRemovalAllowed():300:300 -> a
-    16:16:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):283 -> a
-    17:17:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):283:283 -> a
-    18:18:boolean isMinificationAllowed():304:304 -> a
-    18:18:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):284 -> a
-    19:19:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):284:284 -> a
-    20:20:boolean isOptimizationAllowed():308:308 -> a
-    20:20:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):285 -> a
-    21:21:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):285:285 -> a
-    22:22:boolean isShrinkingAllowed():312:312 -> a
-    22:22:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):286 -> a
-    23:23:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):286:286 -> a
-    24:24:boolean isAccessModificationRequiredForRepackaging():292:292 -> a
-    24:24:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):287 -> a
-    25:25:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):288:288 -> a
+    1:1:void <init>():235:235 -> <init>
+    2:10:void <init>(com.android.tools.r8.shaking.KeepInfo):239:247 -> <init>
+    1:1:com.android.tools.r8.shaking.KeepInfo access$000(com.android.tools.r8.shaking.KeepInfo$Builder):215:215 -> a
+    2:13:com.android.tools.r8.shaking.KeepInfo build():271:282 -> a
+    14:14:boolean isAccessModificationAllowed():300:300 -> a
+    14:14:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):286 -> a
+    15:15:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):286:286 -> a
+    16:16:boolean isAnnotationRemovalAllowed():304:304 -> a
+    16:16:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):287 -> a
+    17:17:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):287:287 -> a
+    18:18:boolean isMinificationAllowed():308:308 -> a
+    18:18:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):288 -> a
+    19:19:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):288:288 -> a
+    20:20:boolean isOptimizationAllowed():312:312 -> a
+    20:20:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):289 -> a
+    21:21:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):289:289 -> a
+    22:22:boolean isShrinkingAllowed():316:316 -> a
+    22:22:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):290 -> a
+    23:23:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):290:290 -> a
+    24:24:boolean isAccessModificationRequiredForRepackaging():296:296 -> a
+    24:24:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):291 -> a
+    25:25:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):292:292 -> a
     boolean isEqualTo(com.android.tools.r8.shaking.KeepInfo) -> b
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder setAllowAccessModification(boolean):369:370 -> b
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder disallowAccessModification():378 -> b
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder setAllowAnnotationRemoval(boolean):382:383 -> c
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder disallowAnnotationRemoval():391 -> c
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder setAllowMinification(boolean):316:317 -> d
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder disallowMinification():325 -> d
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder setAllowOptimization(boolean):329:330 -> e
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder disallowOptimization():338 -> e
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder setAllowShrinking(boolean):342:343 -> f
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder disallowShrinking():351 -> f
+    1:2:com.android.tools.r8.shaking.KeepInfo$Builder setAllowAccessModification(boolean):373:374 -> b
+    1:2:com.android.tools.r8.shaking.KeepInfo$Builder disallowAccessModification():382 -> b
+    1:2:com.android.tools.r8.shaking.KeepInfo$Builder setAllowAnnotationRemoval(boolean):386:387 -> c
+    1:2:com.android.tools.r8.shaking.KeepInfo$Builder disallowAnnotationRemoval():395 -> c
+    1:2:com.android.tools.r8.shaking.KeepInfo$Builder setAllowMinification(boolean):320:321 -> d
+    1:2:com.android.tools.r8.shaking.KeepInfo$Builder disallowMinification():329 -> d
+    1:2:com.android.tools.r8.shaking.KeepInfo$Builder setAllowOptimization(boolean):333:334 -> e
+    1:2:com.android.tools.r8.shaking.KeepInfo$Builder disallowOptimization():342 -> e
+    1:2:com.android.tools.r8.shaking.KeepInfo$Builder setAllowShrinking(boolean):346:347 -> f
+    1:2:com.android.tools.r8.shaking.KeepInfo$Builder disallowShrinking():355 -> f
     com.android.tools.r8.shaking.KeepInfo doBuild() -> g
     com.android.tools.r8.shaking.KeepInfo getBottomInfo() -> h
     com.android.tools.r8.shaking.KeepInfo getTopInfo() -> i
-    1:1:boolean isAccessModificationAllowed():296:296 -> j
-    1:1:boolean isAccessModificationRequiredForRepackaging():292:292 -> k
-    1:1:boolean isAnnotationRemovalAllowed():300:300 -> l
-    1:1:boolean isMinificationAllowed():304:304 -> m
-    1:1:boolean isOptimizationAllowed():308:308 -> n
-    1:1:boolean isShrinkingAllowed():312:312 -> o
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder setAllowAccessModification(boolean):369:370 -> p
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder allowAccessModification():374 -> p
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():257 -> p
-    3:4:com.android.tools.r8.shaking.KeepInfo$Builder setAllowAnnotationRemoval(boolean):382:383 -> p
-    3:4:com.android.tools.r8.shaking.KeepInfo$Builder allowAnnotationRemoval():387 -> p
-    3:4:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():258 -> p
-    5:6:com.android.tools.r8.shaking.KeepInfo$Builder setAllowMinification(boolean):316:317 -> p
-    5:6:com.android.tools.r8.shaking.KeepInfo$Builder allowMinification():321 -> p
-    5:6:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():259 -> p
-    7:8:com.android.tools.r8.shaking.KeepInfo$Builder setAllowOptimization(boolean):329:330 -> p
-    7:8:com.android.tools.r8.shaking.KeepInfo$Builder allowOptimization():334 -> p
-    7:8:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():260 -> p
-    9:10:com.android.tools.r8.shaking.KeepInfo$Builder setAllowShrinking(boolean):342:343 -> p
-    9:10:com.android.tools.r8.shaking.KeepInfo$Builder allowShrinking():347 -> p
-    9:10:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():261 -> p
-    11:12:com.android.tools.r8.shaking.KeepInfo$Builder setRequireAccessModificationForRepackaging(boolean):356:357 -> p
-    11:12:com.android.tools.r8.shaking.KeepInfo$Builder unsetRequireAccessModificationForRepackaging():365 -> p
-    11:12:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():262 -> p
-    13:13:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():263:263 -> p
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder setAllowAccessModification(boolean):369:370 -> q
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder disallowAccessModification():378 -> q
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():247 -> q
-    3:4:com.android.tools.r8.shaking.KeepInfo$Builder setAllowAnnotationRemoval(boolean):382:383 -> q
-    3:4:com.android.tools.r8.shaking.KeepInfo$Builder disallowAnnotationRemoval():391 -> q
-    3:4:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():248 -> q
-    5:6:com.android.tools.r8.shaking.KeepInfo$Builder setAllowMinification(boolean):316:317 -> q
-    5:6:com.android.tools.r8.shaking.KeepInfo$Builder disallowMinification():325 -> q
-    5:6:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():249 -> q
-    7:8:com.android.tools.r8.shaking.KeepInfo$Builder setAllowOptimization(boolean):329:330 -> q
-    7:8:com.android.tools.r8.shaking.KeepInfo$Builder disallowOptimization():338 -> q
-    7:8:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():250 -> q
-    9:10:com.android.tools.r8.shaking.KeepInfo$Builder setAllowShrinking(boolean):342:343 -> q
-    9:10:com.android.tools.r8.shaking.KeepInfo$Builder disallowShrinking():351 -> q
-    9:10:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():251 -> q
-    11:12:com.android.tools.r8.shaking.KeepInfo$Builder setRequireAccessModificationForRepackaging(boolean):356:357 -> q
-    11:12:com.android.tools.r8.shaking.KeepInfo$Builder requireAccessModificationForRepackaging():361 -> q
-    11:12:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():252 -> q
-    13:13:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():253:253 -> q
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder setRequireAccessModificationForRepackaging(boolean):356:357 -> r
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder requireAccessModificationForRepackaging():361 -> r
+    1:1:boolean isAccessModificationAllowed():300:300 -> j
+    1:1:boolean isAccessModificationRequiredForRepackaging():296:296 -> k
+    1:1:boolean isAnnotationRemovalAllowed():304:304 -> l
+    1:1:boolean isMinificationAllowed():308:308 -> m
+    1:1:boolean isOptimizationAllowed():312:312 -> n
+    1:1:boolean isShrinkingAllowed():316:316 -> o
+    1:2:com.android.tools.r8.shaking.KeepInfo$Builder setAllowAccessModification(boolean):373:374 -> p
+    1:2:com.android.tools.r8.shaking.KeepInfo$Builder allowAccessModification():378 -> p
+    1:2:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():261 -> p
+    3:4:com.android.tools.r8.shaking.KeepInfo$Builder setAllowAnnotationRemoval(boolean):386:387 -> p
+    3:4:com.android.tools.r8.shaking.KeepInfo$Builder allowAnnotationRemoval():391 -> p
+    3:4:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():262 -> p
+    5:6:com.android.tools.r8.shaking.KeepInfo$Builder setAllowMinification(boolean):320:321 -> p
+    5:6:com.android.tools.r8.shaking.KeepInfo$Builder allowMinification():325 -> p
+    5:6:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():263 -> p
+    7:8:com.android.tools.r8.shaking.KeepInfo$Builder setAllowOptimization(boolean):333:334 -> p
+    7:8:com.android.tools.r8.shaking.KeepInfo$Builder allowOptimization():338 -> p
+    7:8:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():264 -> p
+    9:10:com.android.tools.r8.shaking.KeepInfo$Builder setAllowShrinking(boolean):346:347 -> p
+    9:10:com.android.tools.r8.shaking.KeepInfo$Builder allowShrinking():351 -> p
+    9:10:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():265 -> p
+    11:12:com.android.tools.r8.shaking.KeepInfo$Builder setRequireAccessModificationForRepackaging(boolean):360:361 -> p
+    11:12:com.android.tools.r8.shaking.KeepInfo$Builder unsetRequireAccessModificationForRepackaging():369 -> p
+    11:12:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():266 -> p
+    13:13:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():267:267 -> p
+    1:2:com.android.tools.r8.shaking.KeepInfo$Builder setAllowAccessModification(boolean):373:374 -> q
+    1:2:com.android.tools.r8.shaking.KeepInfo$Builder disallowAccessModification():382 -> q
+    1:2:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():251 -> q
+    3:4:com.android.tools.r8.shaking.KeepInfo$Builder setAllowAnnotationRemoval(boolean):386:387 -> q
+    3:4:com.android.tools.r8.shaking.KeepInfo$Builder disallowAnnotationRemoval():395 -> q
+    3:4:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():252 -> q
+    5:6:com.android.tools.r8.shaking.KeepInfo$Builder setAllowMinification(boolean):320:321 -> q
+    5:6:com.android.tools.r8.shaking.KeepInfo$Builder disallowMinification():329 -> q
+    5:6:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():253 -> q
+    7:8:com.android.tools.r8.shaking.KeepInfo$Builder setAllowOptimization(boolean):333:334 -> q
+    7:8:com.android.tools.r8.shaking.KeepInfo$Builder disallowOptimization():342 -> q
+    7:8:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():254 -> q
+    9:10:com.android.tools.r8.shaking.KeepInfo$Builder setAllowShrinking(boolean):346:347 -> q
+    9:10:com.android.tools.r8.shaking.KeepInfo$Builder disallowShrinking():355 -> q
+    9:10:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():255 -> q
+    11:12:com.android.tools.r8.shaking.KeepInfo$Builder setRequireAccessModificationForRepackaging(boolean):360:361 -> q
+    11:12:com.android.tools.r8.shaking.KeepInfo$Builder requireAccessModificationForRepackaging():365 -> q
+    11:12:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():256 -> q
+    13:13:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():257:257 -> q
+    1:2:com.android.tools.r8.shaking.KeepInfo$Builder setRequireAccessModificationForRepackaging(boolean):360:361 -> r
+    1:2:com.android.tools.r8.shaking.KeepInfo$Builder requireAccessModificationForRepackaging():365 -> r
     com.android.tools.r8.shaking.KeepInfo$Builder self() -> s
 com.android.tools.r8.shaking.KeepInfo$Joiner -> com.android.tools.r8.shaking.x0:
     java.util.Set rules -> b
     boolean $assertionsDisabled -> c
     com.android.tools.r8.shaking.KeepInfo$Builder builder -> a
-    1:1:void <clinit>():396:396 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):408:408 -> <init>
-    2:5:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):406:409 -> <init>
+    1:1:void <clinit>():400:400 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):412:412 -> <init>
+    2:5:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):410:413 -> <init>
     com.android.tools.r8.shaking.KeepClassInfo$Joiner asClassJoiner() -> a
-    1:3:com.android.tools.r8.shaking.KeepInfo$Joiner applyIf(boolean,java.util.function.Consumer):414:416 -> a
-    4:5:com.android.tools.r8.shaking.KeepInfo$Joiner addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):453:454 -> a
-    6:13:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):488:495 -> a
-    14:18:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):494:498 -> a
+    1:3:com.android.tools.r8.shaking.KeepInfo$Joiner applyIf(boolean,java.util.function.Consumer):418:420 -> a
+    4:5:com.android.tools.r8.shaking.KeepInfo$Joiner addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):457:458 -> a
+    6:13:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):492:499 -> a
+    14:18:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):498:502 -> a
     com.android.tools.r8.shaking.KeepFieldInfo$Joiner asFieldJoiner() -> b
     com.android.tools.r8.shaking.KeepMethodInfo$Joiner asMethodJoiner() -> c
-    1:2:com.android.tools.r8.shaking.KeepInfo$Joiner disallowAccessModification():458:459 -> d
-    1:2:com.android.tools.r8.shaking.KeepInfo$Joiner disallowAnnotationRemoval():463:464 -> e
-    1:2:com.android.tools.r8.shaking.KeepInfo$Joiner disallowMinification():468:469 -> f
-    1:2:com.android.tools.r8.shaking.KeepInfo$Joiner disallowOptimization():473:474 -> g
-    1:2:com.android.tools.r8.shaking.KeepInfo$Joiner disallowShrinking():478:479 -> h
-    1:3:com.android.tools.r8.shaking.KeepInfo join():507:509 -> i
-    1:2:com.android.tools.r8.shaking.KeepInfo$Joiner requireAccessModificationForRepackaging():483:484 -> j
+    1:2:com.android.tools.r8.shaking.KeepInfo$Joiner disallowAccessModification():462:463 -> d
+    1:2:com.android.tools.r8.shaking.KeepInfo$Joiner disallowAnnotationRemoval():467:468 -> e
+    1:2:com.android.tools.r8.shaking.KeepInfo$Joiner disallowMinification():472:473 -> f
+    1:2:com.android.tools.r8.shaking.KeepInfo$Joiner disallowOptimization():477:478 -> g
+    1:2:com.android.tools.r8.shaking.KeepInfo$Joiner disallowShrinking():482:483 -> h
+    1:3:com.android.tools.r8.shaking.KeepInfo join():511:513 -> i
+    1:2:com.android.tools.r8.shaking.KeepInfo$Joiner requireAccessModificationForRepackaging():487:488 -> j
     com.android.tools.r8.shaking.KeepInfo$Joiner self() -> k
-    1:2:com.android.tools.r8.shaking.KeepInfo$Joiner top():448:449 -> l
+    1:2:com.android.tools.r8.shaking.KeepInfo$Joiner top():452:453 -> l
 com.android.tools.r8.shaking.KeepInfoCollection -> com.android.tools.r8.shaking.A0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():39:39 -> <clinit>
@@ -122543,7 +122795,7 @@ com.android.tools.r8.shaking.KeepReason$TargetedBySuper -> com.android.tools.r8.
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):144:144 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):147:147 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():152:152 -> a
-com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.internal.O31:
+com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.internal.R31:
     java.util.List pruned -> b
     java.util.Set emulatedInterfaces -> a
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):32:32 -> <init>
@@ -122555,7 +122807,7 @@ com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.internal.O31:
     23:24:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):52:53 -> a
     25:39:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):50:64 -> a
     40:40:boolean lambda$prune$0(com.android.tools.r8.graph.DexType):58:58 -> a
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.internal.G41:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.internal.J41:
     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
@@ -122589,7 +122841,7 @@ com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.
     10:14:void logResults():163:167 -> b
     15:22:void logResults():164:171 -> b
     23:29:void logResults():168:174 -> b
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.internal.F41:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.internal.I41:
     com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration INSTANCE -> a
     1:1:void <clinit>():185:185 -> <clinit>
     1:1:void <init>():188:188 -> <init>
@@ -122597,9 +122849,9 @@ com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysis
     2:4:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):200:202 -> a
     5:27:boolean com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration.isLegitimateConstructorInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):212:234 -> a
     5:27:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):201 -> a
-com.android.tools.r8.shaking.LibraryModeledPredicate -> com.android.tools.r8.internal.J41:
+com.android.tools.r8.shaking.LibraryModeledPredicate -> com.android.tools.r8.internal.M41:
     boolean isModeled(com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.internal.m61:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.internal.p61:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector codeDirectReferenceCollector -> b
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> c
     java.util.function.Consumer consumer -> d
@@ -122626,8 +122878,8 @@ com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r
     23:23:com.android.tools.r8.graph.DexProgramClass getFirstReferenceOutsideFromCode(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,java.util.function.Predicate):90:90 -> a
     24:28:void lambda$getFirstReferenceOutsideFromCode$3(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.Predicate,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType):81:85 -> a
     29:32:void traceMethodDirectDependencies(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):98:101 -> a
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> com.android.tools.r8.internal.j61:
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.internal.k61:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> com.android.tools.r8.internal.m61:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.internal.n61:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> a
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer):187:187 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):187:187 -> <init>
@@ -122638,8 +122890,8 @@ com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectRefere
     1:2:boolean addField(com.android.tools.r8.graph.DexField):197:198 -> b
     3:4:boolean addMethod(com.android.tools.r8.graph.DexMethod):204:205 -> b
     5:5:boolean addType(com.android.tools.r8.graph.DexType):225:225 -> b
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.internal.l61:
-    com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> c
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.internal.o61:
+    com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> d
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):105:105 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexItemFactory):107:108 -> <init>
     1:1:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):123:123 -> a
@@ -122814,14 +123066,14 @@ com.android.tools.r8.shaking.MainDexInfo$Builder -> com.android.tools.r8.shaking
     1:1:boolean contains(com.android.tools.r8.graph.DexType):383 -> e
     2:2:boolean isDependency(com.android.tools.r8.graph.DexType):375:375 -> e
     2:2:boolean contains(com.android.tools.r8.graph.DexType):383 -> e
-com.android.tools.r8.shaking.MainDexInfo$MainDexGroup -> com.android.tools.r8.internal.n61:
+com.android.tools.r8.shaking.MainDexInfo$MainDexGroup -> com.android.tools.r8.internal.q61:
     com.android.tools.r8.shaking.MainDexInfo$MainDexGroup MAIN_DEX_LIST -> a
     com.android.tools.r8.shaking.MainDexInfo$MainDexGroup NOT_IN_MAIN_DEX -> d
     com.android.tools.r8.shaking.MainDexInfo$MainDexGroup MAIN_DEX_ROOT -> b
     com.android.tools.r8.shaking.MainDexInfo$MainDexGroup MAIN_DEX_DEPENDENCY -> c
     1:4:void <clinit>():37:40 -> <clinit>
     1:1:void <init>(java.lang.String,int):36:36 -> <init>
-com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.internal.o61:
+com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.internal.r61:
     java.util.Map annotationTypeContainEnum -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.shaking.MainDexInfo$Builder mainDexInfoBuilder -> d
@@ -122885,7 +123137,7 @@ com.android.tools.r8.shaking.MemberValuePropagationRule$Builder -> com.android.t
     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() -> d
-com.android.tools.r8.shaking.MemberValuePropagationRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.c71:
+com.android.tools.r8.shaking.MemberValuePropagationRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.f71:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
@@ -122910,11 +123162,11 @@ com.android.tools.r8.shaking.MinimumKeepInfoCollection -> com.android.tools.r8.s
     19:19:void forEach(java.util.function.BiConsumer):49:49 -> a
     19:19:void merge(com.android.tools.r8.shaking.MinimumKeepInfoCollection):108 -> a
     20:20:void mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):113:113 -> a
-    21:21:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):503:503 -> a
+    21:21:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):507:507 -> a
     21:21:void mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):113 -> a
     22:22:void pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):117:117 -> a
     23:23:boolean lambda$pruneDeadItems$9(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):120:120 -> a
-    24:24:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isBottom():436:436 -> a
+    24:24:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isBottom():440:440 -> a
     24:24:boolean lambda$pruneDeadItems$9(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):120 -> a
     25:35:boolean lambda$pruneDeadItems$9(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):120:130 -> a
     36:36:com.android.tools.r8.graph.ProgramDefinition lambda$pruneDeadItems$6(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):123:123 -> a
@@ -122938,7 +123190,7 @@ com.android.tools.r8.shaking.MinimumKeepInfoCollection -> com.android.tools.r8.s
     48:48:void forEach(java.util.function.BiConsumer):49:49 -> a
     48:48:com.android.tools.r8.shaking.MinimumKeepInfoCollection rewrittenWithLens(com.android.tools.r8.graph.GraphLens):148 -> a
     49:65:void lambda$rewrittenWithLens$11(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):150:166 -> a
-    66:66:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):503:503 -> a
+    66:66:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):507:507 -> a
     66:66:void lambda$rewrittenWithLens$11(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):167 -> a
     67:67:com.android.tools.r8.graph.DexReference lambda$rewrittenWithLens$10(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType):153:153 -> a
     68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):352:352 -> a
@@ -122952,92 +123204,92 @@ com.android.tools.r8.shaking.MinimumKeepInfoCollection -> com.android.tools.r8.s
     75:75:void lambda$forEach$1(com.android.tools.r8.graph.DexProgramClass,java.util.function.BiConsumer,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexField):67:67 -> a
     1:1:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$getOrCreateMinimumKeepInfoFor$5(com.android.tools.r8.graph.DexReference):94:94 -> b
     2:2:boolean isEmpty():104:104 -> b
-com.android.tools.r8.shaking.MissingClasses -> com.android.tools.r8.internal.c81:
+com.android.tools.r8.shaking.MissingClasses -> com.android.tools.r8.internal.f81:
     java.util.Set missingClasses -> a
-    1:1:void <init>(java.util.Set,com.android.tools.r8.shaking.MissingClasses$1):37:37 -> <init>
-    2:3:void <init>(java.util.Set):41:42 -> <init>
-    1:1:com.android.tools.r8.shaking.MissingClasses$Builder builder():46:46 -> a
-    2:2:com.android.tools.r8.shaking.MissingClasses$Builder com.android.tools.r8.shaking.MissingClasses.builder():46:46 -> a
-    2:2:com.android.tools.r8.shaking.MissingClasses commitSyntheticItems(com.android.tools.r8.synthesis.CommittedItems):54 -> a
-    3:4:com.android.tools.r8.shaking.MissingClasses commitSyntheticItems(com.android.tools.r8.synthesis.CommittedItems):56:57 -> a
-    5:5:void forEach(java.util.function.Consumer):61:61 -> a
-    6:6:boolean contains(com.android.tools.r8.graph.DexType):65:65 -> a
-    1:1:com.android.tools.r8.shaking.MissingClasses empty():50:50 -> b
-com.android.tools.r8.shaking.MissingClasses$1 -> com.android.tools.r8.internal.a81:
-com.android.tools.r8.shaking.MissingClasses$Builder -> com.android.tools.r8.internal.b81:
+    1:1:void <init>(java.util.Set,com.android.tools.r8.shaking.MissingClasses$1):38:38 -> <init>
+    2:3:void <init>(java.util.Set):42:43 -> <init>
+    1:1:com.android.tools.r8.shaking.MissingClasses$Builder builder():47:47 -> a
+    2:2:com.android.tools.r8.shaking.MissingClasses$Builder com.android.tools.r8.shaking.MissingClasses.builder():47:47 -> a
+    2:2:com.android.tools.r8.shaking.MissingClasses commitSyntheticItems(com.android.tools.r8.synthesis.CommittedItems):55 -> a
+    3:4:com.android.tools.r8.shaking.MissingClasses commitSyntheticItems(com.android.tools.r8.synthesis.CommittedItems):57:58 -> a
+    5:5:void forEach(java.util.function.Consumer):62:62 -> a
+    6:6:boolean contains(com.android.tools.r8.graph.DexType):66:66 -> a
+    1:1:com.android.tools.r8.shaking.MissingClasses empty():51:51 -> b
+com.android.tools.r8.shaking.MissingClasses$1 -> com.android.tools.r8.internal.d81:
+com.android.tools.r8.shaking.MissingClasses$Builder -> com.android.tools.r8.internal.e81:
     java.util.Map newMissingClasses -> b
     java.util.Set newIgnoredMissingClasses -> c
     java.util.Set alreadyMissingClasses -> a
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():68:68 -> <clinit>
-    1:1:void <init>(java.util.Set,com.android.tools.r8.shaking.MissingClasses$1):68:68 -> <init>
-    2:2:void <init>(java.util.Set):78:78 -> <init>
-    3:11:void <init>(java.util.Set):71:79 -> <init>
-    1:1:com.android.tools.r8.shaking.MissingClasses access$100(com.android.tools.r8.shaking.MissingClasses$Builder):68:68 -> a
-    2:7:void addNewMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):83:88 -> a
-    8:10:boolean contains(com.android.tools.r8.graph.DexType):110:112 -> a
-    11:12:com.android.tools.r8.shaking.MissingClasses$Builder removeAlreadyMissingClasses(java.lang.Iterable):116:117 -> a
-    13:15:com.android.tools.r8.shaking.MissingClasses assertNoMissingClasses(com.android.tools.r8.graph.AppView):123:123 -> a
-    17:17:com.android.tools.r8.shaking.MissingClasses assertNoMissingClasses(com.android.tools.r8.graph.AppView):125:125 -> a
-    18:18:java.util.Set lambda$assertNoMissingClasses$2(com.android.tools.r8.graph.DexProgramClass):123:123 -> a
-    19:30:com.android.tools.r8.diagnostic.MissingDefinitionsDiagnostic createDiagnostic(java.util.Map):146:157 -> a
-    31:34:void lambda$createDiagnostic$3(com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$Builder,com.android.tools.r8.graph.DexType,java.util.Set):150:153 -> a
-    35:38:void lambda$createDiagnostic$3(com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$Builder,com.android.tools.r8.graph.DexType,java.util.Set):152:155 -> a
-    39:45:void com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContexts(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):162:168 -> a
-    39:45:java.util.Map getMissingClassesToBeReported(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):229 -> a
-    46:59:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContextsForSingleMissingClass(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):176:189 -> a
-    46:59:void com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContexts(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):167 -> a
-    46:59:java.util.Map getMissingClassesToBeReported(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):229 -> a
+    1:1:void <clinit>():69:69 -> <clinit>
+    1:1:void <init>(java.util.Set,com.android.tools.r8.shaking.MissingClasses$1):69:69 -> <init>
+    2:2:void <init>(java.util.Set):79:79 -> <init>
+    3:11:void <init>(java.util.Set):72:80 -> <init>
+    1:1:com.android.tools.r8.shaking.MissingClasses access$100(com.android.tools.r8.shaking.MissingClasses$Builder):69:69 -> a
+    2:7:void addNewMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):84:89 -> a
+    8:10:boolean contains(com.android.tools.r8.graph.DexType):122:124 -> a
+    11:12:com.android.tools.r8.shaking.MissingClasses$Builder removeAlreadyMissingClasses(java.lang.Iterable):128:129 -> a
+    13:15:com.android.tools.r8.shaking.MissingClasses assertNoMissingClasses(com.android.tools.r8.graph.AppView):135:135 -> a
+    17:17:com.android.tools.r8.shaking.MissingClasses assertNoMissingClasses(com.android.tools.r8.graph.AppView):137:137 -> a
+    18:18:java.util.Set lambda$assertNoMissingClasses$2(com.android.tools.r8.graph.DexProgramClass):135:135 -> a
+    19:30:com.android.tools.r8.diagnostic.MissingDefinitionsDiagnostic createDiagnostic(java.util.Map):158:169 -> a
+    31:34:void lambda$createDiagnostic$3(com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$Builder,com.android.tools.r8.graph.DexType,java.util.Set):162:165 -> a
+    35:38:void lambda$createDiagnostic$3(com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$Builder,com.android.tools.r8.graph.DexType,java.util.Set):164:167 -> a
+    39:45:void com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContexts(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):174:180 -> a
+    39:45:java.util.Map getMissingClassesToBeReported(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):241 -> a
+    46:59:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContextsForSingleMissingClass(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):188:201 -> a
+    46:59:void com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContexts(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):179 -> a
+    46:59:java.util.Map getMissingClassesToBeReported(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):241 -> a
     60:60:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):298:298 -> a
-    60:60:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContextsForSingleMissingClass(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):189 -> a
-    60:60:void com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContexts(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):167 -> a
-    60:60:java.util.Map getMissingClassesToBeReported(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):229 -> a
-    61:81:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContextsForSingleMissingClass(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):190:210 -> a
-    61:81:void com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContexts(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):167 -> a
-    61:81:java.util.Map getMissingClassesToBeReported(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):229 -> a
+    60:60:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContextsForSingleMissingClass(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):201 -> a
+    60:60:void com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContexts(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):179 -> a
+    60:60:java.util.Map getMissingClassesToBeReported(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):241 -> a
+    61:81:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContextsForSingleMissingClass(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):202:222 -> a
+    61:81:void com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContexts(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):179 -> a
+    61:81:java.util.Map getMissingClassesToBeReported(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):241 -> a
     82:82:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    82:82:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContextsForSingleMissingClass(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):211 -> a
-    82:82:void com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContexts(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):167 -> a
-    82:82:java.util.Map getMissingClassesToBeReported(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):229 -> a
-    83:88:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContextsForSingleMissingClass(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):213:218 -> a
-    83:88:void com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContexts(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):167 -> a
-    83:88:java.util.Map getMissingClassesToBeReported(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):229 -> a
-    89:89:void com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContexts(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):166:166 -> a
-    89:89:java.util.Map getMissingClassesToBeReported(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):229 -> a
-    90:93:java.util.Map getMissingClassesToBeReported(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):231:234 -> a
-    94:108:void lambda$getMissingClassesToBeReported$5(java.util.function.Predicate,com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexType,java.util.Set):237:251 -> a
-    109:110:boolean lambda$getMissingClassesToBeReported$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDerivedContext):246:247 -> a
-    111:113:boolean lambda$getIsAllowedMissingClassesPredicate$6(java.util.Set,java.util.function.Predicate,com.android.tools.r8.errors.dontwarn.DontWarnConfiguration,com.android.tools.r8.graph.DexType):263:265 -> a
-    114:115:boolean lambda$getIsCompilerSynthesizedAllowedMissingClassesPredicate$7(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):288:289 -> a
+    82:82:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContextsForSingleMissingClass(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):223 -> a
+    82:82:void com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContexts(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):179 -> a
+    82:82:java.util.Map getMissingClassesToBeReported(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):241 -> a
+    83:88:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContextsForSingleMissingClass(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):225:230 -> a
+    83:88:void com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContexts(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):179 -> a
+    83:88:java.util.Map getMissingClassesToBeReported(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):241 -> a
+    89:89:void com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContexts(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):178:178 -> a
+    89:89:java.util.Map getMissingClassesToBeReported(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):241 -> a
+    90:93:java.util.Map getMissingClassesToBeReported(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):243:246 -> a
+    94:108:void lambda$getMissingClassesToBeReported$5(java.util.function.Predicate,com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexType,java.util.Set):249:263 -> a
+    109:110:boolean lambda$getMissingClassesToBeReported$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDerivedContext):258:259 -> a
+    111:113:boolean lambda$getIsAllowedMissingClassesPredicate$6(java.util.Set,java.util.function.Predicate,com.android.tools.r8.errors.dontwarn.DontWarnConfiguration,com.android.tools.r8.graph.DexType):275:277 -> a
+    114:115:boolean lambda$getIsCompilerSynthesizedAllowedMissingClassesPredicate$7(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):300:301 -> a
     116:116:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
-    116:116:boolean lambda$getIsCompilerSynthesizedAllowedMissingClassesPredicate$7(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):289 -> a
-    117:119:com.android.tools.r8.shaking.MissingClasses build():307:309 -> a
-    120:120:com.android.tools.r8.shaking.MissingClasses build():308:308 -> a
-    1:1:void ignoreNewMissingClass(com.android.tools.r8.graph.DexType):106:106 -> b
-    2:5:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):131:134 -> b
-    6:6:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():478:478 -> b
-    6:6:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):135 -> b
-    7:7:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):135:135 -> b
-    8:8:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():478:478 -> b
-    8:8:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):137 -> b
-    9:12:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):137:140 -> b
-    13:13:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):258:258 -> b
-    14:15:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):269:270 -> b
-    14:15:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):258 -> b
+    116:116:boolean lambda$getIsCompilerSynthesizedAllowedMissingClassesPredicate$7(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):301 -> a
+    117:119:com.android.tools.r8.shaking.MissingClasses build():319:321 -> a
+    120:120:com.android.tools.r8.shaking.MissingClasses build():320:320 -> a
+    1:1:void ignoreNewMissingClass(com.android.tools.r8.graph.DexType):118:118 -> b
+    2:5:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):143:146 -> b
+    6:6:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():479:479 -> b
+    6:6:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):147 -> b
+    7:7:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):147:147 -> b
+    8:8:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():479:479 -> b
+    8:8:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):149 -> b
+    9:12:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):149:152 -> b
+    13:13:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):270:270 -> b
+    14:15:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):281:282 -> b
+    14:15:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):270 -> b
     16:16:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory.getJavaConversionTypes():501:501 -> b
-    16:16:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):278 -> b
-    16:16:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):258 -> b
-    17:17:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):278:278 -> b
-    17:17:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):258 -> b
+    16:16:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):290 -> b
+    16:16:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):270 -> b
+    17:17:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):290:290 -> b
+    17:17:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):270 -> b
     18:18:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory.getJ$ConversionTypes():510:510 -> b
-    18:18:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):279 -> b
-    18:18:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):258 -> b
-    19:20:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):279:280 -> b
-    19:20:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):258 -> b
-    21:23:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):260:262 -> b
-    1:1:java.util.Set lambda$addNewMissingClass$0(com.android.tools.r8.graph.DexType):87:87 -> c
-    2:4:java.util.function.Predicate getIsCompilerSynthesizedAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):285:287 -> c
-    1:1:boolean wasAlreadyMissing(com.android.tools.r8.graph.DexType):313:313 -> d
+    18:18:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):291 -> b
+    18:18:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):270 -> b
+    19:20:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):291:292 -> b
+    19:20:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):270 -> b
+    21:23:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):272:274 -> b
+    1:1:java.util.Set lambda$addNewMissingClass$0(com.android.tools.r8.graph.DexType):88:88 -> c
+    2:4:java.util.function.Predicate getIsCompilerSynthesizedAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):297:299 -> c
+    1:1:boolean wasAlreadyMissing(com.android.tools.r8.graph.DexType):325:325 -> d
 com.android.tools.r8.shaking.NoHorizontalClassMergingRule -> com.android.tools.r8.shaking.d1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,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,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.NoHorizontalClassMergingRule$1):11:11 -> <init>
@@ -123069,7 +123321,7 @@ com.android.tools.r8.shaking.NoVerticalClassMergingRule$Builder -> com.android.t
     1:1:void <init>(com.android.tools.r8.shaking.NoVerticalClassMergingRule$1):14:14 -> <init>
     2:2:void <init>():18:18 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.internal.Bf1:
+com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.internal.Ef1:
     java.util.List NAMES -> c
     int PPP_MASK -> b
     int flags -> a
@@ -123314,7 +123566,7 @@ com.android.tools.r8.shaking.ProguardClassSpecification$Builder -> com.android.t
     1:7:com.android.tools.r8.position.Position getPosition():73:79 -> c
     8:9:com.android.tools.r8.shaking.ProguardClassSpecification$Builder setMemberRules(java.util.List):87:88 -> c
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.internal.If1:
+com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.internal.Lf1:
     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
@@ -123333,25 +123585,25 @@ com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.internal.
     12:12:java.lang.String toString():46:46 -> toString
     13:13:java.lang.String toString():45:45 -> toString
     14:14:java.lang.String toString():44:44 -> toString
-com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.internal.Cf1:
+com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.internal.Ff1:
     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.internal.Df1:
+com.android.tools.r8.shaking.ProguardClassType$2 -> com.android.tools.r8.internal.Gf1:
     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.internal.Ef1:
+com.android.tools.r8.shaking.ProguardClassType$3 -> com.android.tools.r8.internal.Hf1:
     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.internal.Ff1:
+com.android.tools.r8.shaking.ProguardClassType$4 -> com.android.tools.r8.internal.If1:
     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.internal.Gf1:
+com.android.tools.r8.shaking.ProguardClassType$5 -> com.android.tools.r8.internal.Jf1:
     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.ProguardClassType$6 -> com.android.tools.r8.internal.Hf1:
+com.android.tools.r8.shaking.ProguardClassType$6 -> com.android.tools.r8.internal.Kf1:
     int[] $SwitchMap$com$android$tools$r8$shaking$ProguardClassType -> a
     1:1:void <clinit>():43:43 -> <clinit>
-com.android.tools.r8.shaking.ProguardCompatibilityActions -> com.android.tools.r8.internal.Lf1:
+com.android.tools.r8.shaking.ProguardCompatibilityActions -> com.android.tools.r8.internal.Of1:
     java.util.Set compatInstantiatedTypes -> a
     1:1:void <init>(java.util.Set,com.android.tools.r8.shaking.ProguardCompatibilityActions$1):14:14 -> <init>
     2:3:void <init>(java.util.Set):18:19 -> <init>
@@ -123366,8 +123618,8 @@ com.android.tools.r8.shaking.ProguardCompatibilityActions -> com.android.tools.r
     9:9:com.android.tools.r8.shaking.ProguardCompatibilityActions withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):31 -> a
     10:15:com.android.tools.r8.shaking.ProguardCompatibilityActions withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):32:37 -> a
     16:16:boolean isCompatInstantiated(com.android.tools.r8.graph.DexProgramClass):27:27 -> a
-com.android.tools.r8.shaking.ProguardCompatibilityActions$1 -> com.android.tools.r8.internal.Jf1:
-com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder -> com.android.tools.r8.internal.Kf1:
+com.android.tools.r8.shaking.ProguardCompatibilityActions$1 -> com.android.tools.r8.internal.Mf1:
+com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder -> com.android.tools.r8.internal.Nf1:
     java.util.Set compatInstantiatedTypes -> a
     1:3:void <init>():48:50 -> <init>
     1:1:void addCompatInstantiatedType(com.android.tools.r8.graph.DexProgramClass):53:53 -> a
@@ -124676,9 +124928,9 @@ com.android.tools.r8.shaking.ProguardConfigurationRule$1 -> com.android.tools.r8
     1:1:void <init>(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.AppView):121:121 -> <init>
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():132:132 -> a
     1:4:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):124:127 -> c
-com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.internal.Mf1:
+com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.internal.Pf1:
     java.nio.file.Path getBaseDirectory() -> a
-com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.internal.Nf1:
+com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.internal.Qf1:
     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>
@@ -124686,14 +124938,14 @@ com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.too
     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.internal.Of1:
+com.android.tools.r8.shaking.ProguardConfigurationSourceFile -> com.android.tools.r8.internal.Rf1:
     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.internal.Pf1:
+com.android.tools.r8.shaking.ProguardConfigurationSourceStrings -> com.android.tools.r8.internal.Sf1:
     java.util.List config -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path basePath -> a
@@ -124821,7 +125073,7 @@ com.android.tools.r8.shaking.ProguardIfRule$Builder -> com.android.tools.r8.shak
     1:1:void <init>():50:50 -> <init>
     2:2:void <init>():47:47 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.internal.Qf1:
+com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.internal.Tf1:
     boolean runtimeInvisibleAnnotations -> m
     boolean runtimeVisibleParameterAnnotations -> n
     boolean runtimeInvisibleParameterAnnotations -> o
@@ -124937,7 +125189,7 @@ com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder -> com.android.to
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder setAllowsOptimization(boolean):34:34 -> d
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder setAllowsShrinking(boolean):29:29 -> e
     1:1:void setIncludeDescriptorClasses(boolean):44:44 -> f
-com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.internal.Sf1:
+com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.internal.Vf1:
     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
@@ -124952,7 +125204,7 @@ com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.intern
     13:13:java.lang.String toString():22:22 -> toString
     14:14:java.lang.String toString():20:20 -> toString
     15:15:java.lang.String toString():18:18 -> toString
-com.android.tools.r8.shaking.ProguardKeepRuleType$1 -> com.android.tools.r8.internal.Rf1:
+com.android.tools.r8.shaking.ProguardKeepRuleType$1 -> com.android.tools.r8.internal.Uf1:
     int[] $SwitchMap$com$android$tools$r8$shaking$ProguardKeepRuleType -> a
     1:1:void <clinit>():16:16 -> <clinit>
 com.android.tools.r8.shaking.ProguardMemberRule -> com.android.tools.r8.shaking.b2:
@@ -125048,7 +125300,7 @@ com.android.tools.r8.shaking.ProguardMemberRuleReturnValue -> com.android.tools.
     1:1:boolean isSingleValue():82:82 -> i
     1:1:boolean isValueRange():56:56 -> j
     1:17:java.lang.String toString():115:131 -> toString
-com.android.tools.r8.shaking.ProguardMemberType -> com.android.tools.r8.internal.Zf1:
+com.android.tools.r8.shaking.ProguardMemberType -> com.android.tools.r8.internal.cg1:
     com.android.tools.r8.shaking.ProguardMemberType METHOD -> h
     com.android.tools.r8.shaking.ProguardMemberType CONSTRUCTOR -> g
     com.android.tools.r8.shaking.ProguardMemberType INIT -> f
@@ -125109,7 +125361,7 @@ com.android.tools.r8.shaking.ProguardNameMatcher$MatchSpecificName -> com.androi
     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.internal.ag1:
+com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.internal.dg1:
     java.lang.String pattern -> a
     1:2:void <init>(java.lang.String):10:11 -> <init>
     1:1:boolean matches(java.lang.String):15:15 -> a
@@ -125196,7 +125448,7 @@ com.android.tools.r8.shaking.ProguardPathList$PathList -> com.android.tools.r8.s
     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.internal.bg1:
+com.android.tools.r8.shaking.ProguardRuleParserException -> com.android.tools.r8.internal.eg1:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.lang.String message -> a
@@ -125415,7 +125667,7 @@ com.android.tools.r8.shaking.ReprocessMethodRule$Builder -> com.android.tools.r8
     1:1:com.android.tools.r8.shaking.ReprocessMethodRule$Builder setType(com.android.tools.r8.shaking.ReprocessMethodRule$Type):28:28 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
     1:11:com.android.tools.r8.shaking.ReprocessMethodRule build():39:49 -> e
-com.android.tools.r8.shaking.RootSetUtils -> com.android.tools.r8.internal.gm1:
+com.android.tools.r8.shaking.RootSetUtils -> com.android.tools.r8.internal.Yl1:
 com.android.tools.r8.shaking.RootSetUtils$1 -> com.android.tools.r8.shaking.K2:
     int[] $SwitchMap$com$android$tools$r8$shaking$InlineRule$Type -> b
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassInlineRule$Type -> c
@@ -125489,7 +125741,7 @@ com.android.tools.r8.shaking.RootSetUtils$RootSet -> com.android.tools.r8.shakin
     1:1:void <clinit>():1557:1557 -> <clinit>
     1:1:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.shaking.RootSetUtils$1):1557:1557 -> <init>
     2:29:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap):1608:1635 -> <init>
-    1:1:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():440:440 -> a
+    1:1:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():444:444 -> a
     1:1:boolean lambda$isShrinkingDisallowedUnconditionally$2(com.android.tools.r8.shaking.KeepInfo$Joiner):1675 -> a
     2:2:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1557:1557 -> a
     2:2:void pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1679 -> a
@@ -125521,7 +125773,7 @@ com.android.tools.r8.shaking.RootSetUtils$RootSet -> com.android.tools.r8.shakin
     56:56:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod):1700:1700 -> a
     57:57:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod):1699:1699 -> a
     58:58:boolean lambda$verifyKeptFieldsAreAccessedAndLive$6(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1716:1716 -> a
-    59:59:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():440:440 -> a
+    59:59:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():444:444 -> a
     59:59:boolean lambda$verifyKeptFieldsAreAccessedAndLive$6(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1716 -> a
     60:62:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1718:1720 -> a
     63:63:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
@@ -125550,7 +125802,7 @@ com.android.tools.r8.shaking.RootSetUtils$RootSet -> com.android.tools.r8.shakin
     98:98:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1806 -> a
     99:105:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1807:1813 -> a
     106:106:com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):1892:1892 -> a
-    1:1:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():440:440 -> b
+    1:1:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():444:444 -> b
     1:1:boolean lambda$verifyKeptItemsAreKept$12(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1795 -> b
     2:6:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1743:1747 -> b
     7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> b
@@ -125565,7 +125817,7 @@ com.android.tools.r8.shaking.RootSetUtils$RootSet -> com.android.tools.r8.shakin
     1:1:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):1737 -> c
     2:3:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):1738:1739 -> c
     4:4:boolean lambda$verifyKeptMethodsAreTargetedAndLive$8(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1741:1741 -> c
-    5:5:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():440:440 -> c
+    5:5:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():444:444 -> c
     5:5:boolean lambda$verifyKeptMethodsAreTargetedAndLive$8(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1741 -> c
     6:7:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1766:1767 -> c
     8:9:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isLiveProgramType(com.android.tools.r8.graph.DexType):563:564 -> c
@@ -125578,7 +125830,7 @@ com.android.tools.r8.shaking.RootSetUtils$RootSet -> com.android.tools.r8.shakin
     4:4:boolean lambda$verifyKeptTypesAreLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1764:1764 -> d
     5:5:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> d
     5:5:boolean lambda$verifyKeptTypesAreLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1764 -> d
-    6:6:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():440:440 -> d
+    6:6:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():444:444 -> d
     6:6:boolean lambda$verifyKeptTypesAreLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1764 -> d
     1:9:java.lang.String toString():1872:1880 -> toString
 com.android.tools.r8.shaking.RootSetUtils$RootSetBase -> com.android.tools.r8.shaking.Q2:
@@ -125716,10 +125968,10 @@ com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder -> com.android.tools.r8
     426:426:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1113 -> a
     427:428:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):74:75 -> a
     427:428:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1113 -> a
-    429:430:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):453:454 -> a
+    429:430:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):457:458 -> a
     429:430:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1114 -> a
     431:435:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1115:1119 -> a
-    436:436:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():595:595 -> a
+    436:436:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():601:601 -> a
     436:436:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1119 -> a
     437:438:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1119:1120 -> a
     439:439:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():679:679 -> a
@@ -125768,7 +126020,7 @@ com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder -> com.android.tools.r8
     721:725:boolean isInterfaceMethodNeedingDesugaring(com.android.tools.r8.graph.ProgramDefinition):1472:1476 -> a
     721:725:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1385 -> a
     726:744:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1386:1404 -> a
-    745:745:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():600:600 -> a
+    745:745:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():606:606 -> a
     745:745:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1404 -> a
     746:748:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1404:1406 -> a
     749:750:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):74:75 -> a
@@ -125777,30 +126029,30 @@ com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder -> com.android.tools.r8
     757:758:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):74:75 -> a
     757:758:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1412 -> a
     759:769:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1413:1423 -> a
-    770:771:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():672:673 -> a
+    770:771:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():678:679 -> a
     770:771:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1423 -> a
     772:774:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1423:1425 -> a
     775:776:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):74:75 -> a
     775:776:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1425 -> a
-    777:778:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAccessModification():458:459 -> a
+    777:778:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAccessModification():462:463 -> a
     777:778:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1426 -> a
     779:782:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1427:1430 -> a
-    783:783:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():610:610 -> a
-    783:783:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():585 -> a
+    783:783:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():616:616 -> a
+    783:783:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():591 -> a
     783:783:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1430 -> a
     784:786:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1430:1432 -> a
     787:788:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):74:75 -> a
     787:788:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1432 -> a
-    789:790:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval():463:464 -> a
+    789:790:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval():467:468 -> a
     789:790:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1433 -> a
     791:794:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1434:1437 -> a
-    795:795:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():595:595 -> a
+    795:795:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():601:601 -> a
     795:795:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1437 -> a
     796:798:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1437:1439 -> a
     799:800:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):74:75 -> a
     799:800:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1439 -> a
     801:805:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1440:1444 -> a
-    806:806:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():600:600 -> a
+    806:806:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():606:606 -> a
     806:806:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1444 -> a
     807:809:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1444:1446 -> a
     810:811:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):74:75 -> a
@@ -125812,7 +126064,7 @@ com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder -> com.android.tools.r8
     823:824:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):74:75 -> a
     823:824:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1455 -> a
     825:829:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1456:1460 -> a
-    830:831:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.requireAccessModificationForRepackaging():483:484 -> a
+    830:831:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.requireAccessModificationForRepackaging():487:488 -> a
     830:831:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1461 -> a
     832:832:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1465:1465 -> a
     833:843:void includeDescriptorClasses(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1128:1138 -> a
@@ -125852,7 +126104,7 @@ com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder -> com.android.tools.r8
     85:97:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):217:229 -> b
     98:107:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):228:237 -> b
     108:149:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):210:251 -> b
-    150:150:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():478:478 -> b
+    150:150:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():479:479 -> b
     150:150:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):252 -> b
     151:195:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):252:296 -> b
     196:197:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):287:288 -> b
@@ -125924,7 +126176,7 @@ com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder$SynthesizeMissingInterf
     55:55:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
     55:55:void lambda$tryAndKeepMethodOnClass$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):645 -> a
     56:57:void lambda$tryAndKeepMethodOnClass$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):653:654 -> a
-com.android.tools.r8.shaking.RuntimeTypeCheckInfo -> com.android.tools.r8.internal.nm1:
+com.android.tools.r8.shaking.RuntimeTypeCheckInfo -> com.android.tools.r8.internal.fm1:
     java.util.Set exceptionGuardTypes -> c
     java.util.Set instanceOfTypes -> a
     java.util.Set checkCastTypes -> b
@@ -125936,7 +126188,7 @@ com.android.tools.r8.shaking.RuntimeTypeCheckInfo -> com.android.tools.r8.intern
     3:3:boolean com.android.tools.r8.shaking.RuntimeTypeCheckInfo.isExceptionGuardType(com.android.tools.r8.graph.DexProgramClass):102:102 -> a
     3:3:boolean isRuntimeCheckType(com.android.tools.r8.graph.DexProgramClass):106 -> a
     4:7:com.android.tools.r8.shaking.RuntimeTypeCheckInfo rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):110:113 -> a
-com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder -> com.android.tools.r8.internal.mm1:
+com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder -> com.android.tools.r8.internal.em1:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     java.util.Set instanceOfTypes -> c
     java.util.Set checkCastTypes -> d
@@ -125971,7 +126223,7 @@ com.android.tools.r8.shaking.ScopedDexMethodSet -> com.android.tools.r8.shaking.
     21:21:com.android.tools.r8.shaking.ScopedDexMethodSet getParent():75:75 -> a
     22:22:void setParent(com.android.tools.r8.shaking.ScopedDexMethodSet):79:79 -> a
     1:1:com.android.tools.r8.shaking.ScopedDexMethodSet newNestedScope():36:36 -> b
-com.android.tools.r8.shaking.SingleTargetLookupCache -> com.android.tools.r8.internal.pn1:
+com.android.tools.r8.shaking.SingleTargetLookupCache -> com.android.tools.r8.internal.hn1:
     java.util.Map cache -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -125984,7 +126236,7 @@ com.android.tools.r8.shaking.SingleTargetLookupCache -> com.android.tools.r8.int
     17:17:void lambda$removeInstantiatedType$3(com.android.tools.r8.ir.desugar.LambdaDescriptor):47:47 -> a
     18:23:com.android.tools.r8.graph.DexEncodedMethod getCachedItem(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):52:57 -> a
     1:5:boolean hasCachedItem(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):61:65 -> b
-com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.internal.hr1:
+com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.internal.Zq1:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set prunedTypes -> d
     java.util.Set methodsToKeepForConfigurationDebugging -> e
@@ -126051,7 +126303,7 @@ com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.internal.hr1:
     171:172:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):277:278 -> a
     173:194:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):290:311 -> a
     195:215:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):308:328 -> a
-    216:216:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():489:489 -> a
+    216:216:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():431:431 -> a
     216:216:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):329 -> a
     217:225:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):329:337 -> a
     226:237:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):336:347 -> a
@@ -126064,12 +126316,12 @@ com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.internal.hr1:
     2:2:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):166 -> b
     3:9:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):167:173 -> b
     10:10:java.util.Set getRemovedClasses():384:384 -> b
-com.android.tools.r8.shaking.TreePruner$1 -> com.android.tools.r8.internal.gr1:
+com.android.tools.r8.shaking.TreePruner$1 -> com.android.tools.r8.internal.Yq1:
     com.android.tools.r8.shaking.TreePruner this$0 -> a
     1:1:void <init>(com.android.tools.r8.shaking.TreePruner):401:401 -> <init>
     1:1:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):404:404 -> a
     2:2:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):410:410 -> a
-com.android.tools.r8.shaking.TreePrunerConfiguration -> com.android.tools.r8.internal.ir1:
+com.android.tools.r8.shaking.TreePrunerConfiguration -> com.android.tools.r8.internal.ar1:
     boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField) -> a
 com.android.tools.r8.shaking.UnusedArgumentRule -> com.android.tools.r8.shaking.X2:
     int $r8$clinit -> r
@@ -126081,7 +126333,7 @@ com.android.tools.r8.shaking.UnusedArgumentRule$Builder -> com.android.tools.r8.
     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() -> d
-com.android.tools.r8.shaking.UnusedItemsPrinter -> com.android.tools.r8.internal.ss1:
+com.android.tools.r8.shaking.UnusedItemsPrinter -> com.android.tools.r8.internal.ks1:
     com.android.tools.r8.shaking.UnusedItemsPrinter DONT_PRINT -> e
     com.android.tools.r8.shaking.UnusedItemsPrinter$Members currentMembers -> c
     java.util.List classes -> d
@@ -126151,8 +126403,8 @@ com.android.tools.r8.shaking.UnusedItemsPrinter -> com.android.tools.r8.internal
     5:8:void visited():61:64 -> b
     9:9:void registerUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):68:68 -> b
     10:10:void registerUnusedField(com.android.tools.r8.graph.DexEncodedField):72:72 -> b
-com.android.tools.r8.shaking.UnusedItemsPrinter$1 -> com.android.tools.r8.internal.ps1:
-com.android.tools.r8.shaking.UnusedItemsPrinter$Members -> com.android.tools.r8.internal.qs1:
+com.android.tools.r8.shaking.UnusedItemsPrinter$1 -> com.android.tools.r8.internal.hs1:
+com.android.tools.r8.shaking.UnusedItemsPrinter$Members -> com.android.tools.r8.internal.is1:
     java.util.List methods -> b
     java.util.List fields -> a
     1:3:void <init>():18:20 -> <init>
@@ -126160,7 +126412,7 @@ com.android.tools.r8.shaking.UnusedItemsPrinter$Members -> com.android.tools.r8.
     1:1:int lambda$sort$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):27:27 -> a
     2:3:void sort():27:28 -> a
     4:4:int lambda$sort$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):28:28 -> a
-com.android.tools.r8.shaking.UnusedItemsPrinter$NopPrinter -> com.android.tools.r8.internal.rs1:
+com.android.tools.r8.shaking.UnusedItemsPrinter$NopPrinter -> com.android.tools.r8.internal.js1:
     1:1:void <init>():139:139 -> <init>
     void finished() -> a
     void registerUnusedClass(com.android.tools.r8.graph.DexProgramClass) -> a
@@ -126168,7 +126420,7 @@ com.android.tools.r8.shaking.UnusedItemsPrinter$NopPrinter -> com.android.tools.
     void registerUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod) -> b
     void visited() -> b
     void visiting(com.android.tools.r8.graph.DexProgramClass) -> b
-com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.internal.ft1:
+com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.internal.Ys1:
     com.android.tools.r8.androidapi.AndroidApiReferenceLevelCache apiReferenceLevelCache -> j
     com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> b
     com.android.tools.r8.shaking.MainDexInfo mainDexInfo -> q
@@ -126187,169 +126439,169 @@ com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.interna
     java.util.Set mergeCandidates -> l
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap mergedClasses -> m
     java.util.Set pinnedTypes -> n
-    1:1:void <clinit>():113:113 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):248:248 -> <init>
-    2:41:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):224:263 -> <init>
-    1:1:java.util.Set access$000(com.android.tools.r8.shaking.VerticalClassMerger):113:113 -> a
-    2:20:void initializeMergeCandidates(java.lang.Iterable):267:285 -> a
-    21:30:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):349:358 -> a
-    31:42:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):366:377 -> a
+    1:1:void <clinit>():112:112 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):247:247 -> <init>
+    2:41:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):223:262 -> <init>
+    1:1:java.util.Set access$000(com.android.tools.r8.shaking.VerticalClassMerger):112:112 -> a
+    2:20:void initializeMergeCandidates(java.lang.Iterable):266:284 -> a
+    21:30:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):348:357 -> a
+    31:42:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):365:376 -> a
     43:43:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    43:43:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):377 -> a
-    44:47:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):377:377 -> a
-    51:53:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):381:383 -> a
+    43:43:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):376 -> a
+    44:47:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):376:376 -> a
+    51:53:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):380:382 -> a
     54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():721:721 -> a
     54:54:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):130 -> a
     54:54:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):178 -> a
-    54:54:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):383 -> a
+    54:54:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):382 -> a
     55:55:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):130:130 -> a
     55:55:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):178 -> a
-    55:55:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):383 -> a
+    55:55:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):382 -> a
     56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():721:721 -> a
     56:56:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):130 -> a
     56:56:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):178 -> a
-    56:56:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):383 -> a
+    56:56:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):382 -> a
     57:57:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):130:130 -> a
     57:57:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):178 -> a
-    57:57:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):383 -> a
-    58:61:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):386:389 -> a
+    57:57:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):382 -> a
+    58:61:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):385:388 -> a
     62:62:boolean com.android.tools.r8.graph.DexClass.isAnnotation():651:651 -> a
-    62:62:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):393 -> a
-    63:64:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):396:397 -> a
+    62:62:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):392 -> a
+    63:64:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):395:396 -> a
     65:65:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):386:386 -> a
-    65:65:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):398 -> a
-    66:108:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):410:452 -> a
-    109:110:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):431:432 -> a
-    111:157:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):464:510 -> a
-    158:176:boolean com.android.tools.r8.shaking.VerticalClassMerger.fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):903:921 -> a
-    158:176:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):516 -> a
-    177:177:boolean com.android.tools.r8.shaking.VerticalClassMerger.fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):920:920 -> a
-    177:177:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):516 -> a
-    178:179:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):517:518 -> a
-    180:181:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):503:504 -> a
-    182:183:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):483:484 -> a
-    184:184:boolean lambda$isStillMergeCandidate$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):479:479 -> a
-    185:190:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$2(com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector,com.android.tools.r8.graph.ProgramMethod):567:572 -> a
-    191:212:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():677:698 -> a
+    65:65:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):397 -> a
+    66:108:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):409:451 -> a
+    109:110:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):430:431 -> a
+    111:157:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):463:509 -> a
+    158:176:boolean com.android.tools.r8.shaking.VerticalClassMerger.fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):902:920 -> a
+    158:176:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):515 -> a
+    177:177:boolean com.android.tools.r8.shaking.VerticalClassMerger.fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):919:919 -> a
+    177:177:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):515 -> a
+    178:179:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):516:517 -> a
+    180:181:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):502:503 -> a
+    182:183:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):482:483 -> a
+    184:184:boolean lambda$isStillMergeCandidate$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):478:478 -> a
+    185:190:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$2(com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector,com.android.tools.r8.graph.ProgramMethod):566:571 -> a
+    191:212:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():676:697 -> a
     213:213:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):498:498 -> a
-    213:213:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():698 -> a
-    214:217:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():699:702 -> a
-    218:218:void lambda$run$3(com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):698:698 -> a
-    219:224:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):733:738 -> a
+    213:213:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():697 -> a
+    214:217:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():698:701 -> a
+    218:218:void lambda$run$3(com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):697:697 -> a
+    219:224:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):732:737 -> a
     225:225:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):299:299 -> a
-    225:225:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):739 -> a
-    226:245:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):742:761 -> a
-    246:252:void lambda$methodResolutionMayChange$4(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexClassAndMethod):817:823 -> a
-    253:253:void lambda$methodResolutionMayChange$5(com.android.tools.r8.graph.LookupLambdaTarget):828:828 -> a
-    254:305:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):840:891 -> a
-    306:316:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):887:897 -> a
-    317:317:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):893:893 -> a
-    318:318:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):878:878 -> a
-    319:322:void com.android.tools.r8.shaking.VerticalClassMerger.makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1650:1653 -> a
-    319:322:void access$1100(com.android.tools.r8.graph.DexEncodedMethod):113 -> a
-    323:332:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason com.android.tools.r8.shaking.VerticalClassMerger.disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1846:1855 -> a
-    323:332:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):414 -> a
-    333:344:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason com.android.tools.r8.shaking.VerticalClassMerger.disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1851:1862 -> a
-    333:344:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):414 -> a
-    345:345:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason com.android.tools.r8.shaking.VerticalClassMerger.disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1861:1861 -> a
-    345:345:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):414 -> a
-    346:351:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):417:422 -> a
-    1:1:com.android.tools.r8.graph.SubtypingInfo access$100(com.android.tools.r8.shaking.VerticalClassMerger):113:113 -> b
-    2:5:void initializePinnedTypes(java.lang.Iterable):295:298 -> b
-    6:7:void com.android.tools.r8.shaking.VerticalClassMerger.extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):325:326 -> b
-    6:7:void initializePinnedTypes(java.lang.Iterable):299 -> b
+    225:225:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):738 -> a
+    226:245:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):741:760 -> a
+    246:252:void lambda$methodResolutionMayChange$4(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexClassAndMethod):816:822 -> a
+    253:253:void lambda$methodResolutionMayChange$5(com.android.tools.r8.graph.LookupLambdaTarget):827:827 -> a
+    254:305:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):839:890 -> a
+    306:316:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):886:896 -> a
+    317:317:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):892:892 -> a
+    318:318:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):877:877 -> a
+    319:322:void com.android.tools.r8.shaking.VerticalClassMerger.makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1648:1651 -> a
+    319:322:void access$1100(com.android.tools.r8.graph.DexEncodedMethod):112 -> a
+    323:332:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason com.android.tools.r8.shaking.VerticalClassMerger.disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1844:1853 -> a
+    323:332:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):413 -> a
+    333:344:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason com.android.tools.r8.shaking.VerticalClassMerger.disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1849:1860 -> a
+    333:344:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):413 -> a
+    345:345:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason com.android.tools.r8.shaking.VerticalClassMerger.disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1859:1859 -> a
+    345:345:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):413 -> a
+    346:351:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):416:421 -> a
+    1:1:com.android.tools.r8.graph.SubtypingInfo access$100(com.android.tools.r8.shaking.VerticalClassMerger):112:112 -> b
+    2:5:void initializePinnedTypes(java.lang.Iterable):294:297 -> b
+    6:7:void com.android.tools.r8.shaking.VerticalClassMerger.extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):324:325 -> b
+    6:7:void initializePinnedTypes(java.lang.Iterable):298 -> b
     8:8:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> b
-    8:8:void com.android.tools.r8.shaking.VerticalClassMerger.extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):326 -> b
-    8:8:void initializePinnedTypes(java.lang.Iterable):299 -> b
-    9:24:void com.android.tools.r8.shaking.VerticalClassMerger.extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):327:342 -> b
-    9:24:void initializePinnedTypes(java.lang.Iterable):299 -> b
-    25:44:void initializePinnedTypes(java.lang.Iterable):301:320 -> b
-    45:45:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):526:526 -> b
+    8:8:void com.android.tools.r8.shaking.VerticalClassMerger.extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):325 -> b
+    8:8:void initializePinnedTypes(java.lang.Iterable):298 -> b
+    9:24:void com.android.tools.r8.shaking.VerticalClassMerger.extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):326:341 -> b
+    9:24:void initializePinnedTypes(java.lang.Iterable):298 -> b
+    25:44:void initializePinnedTypes(java.lang.Iterable):300:319 -> b
+    45:45:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):525:525 -> b
     46:46:boolean com.android.tools.r8.graph.DexClass.isPrivate():720:720 -> b
-    46:46:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):530 -> b
+    46:46:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):529 -> b
     47:47:boolean com.android.tools.r8.graph.DexClass.isPublic():724:724 -> b
-    47:47:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):530 -> b
+    47:47:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):529 -> b
     48:48:boolean com.android.tools.r8.graph.DexClass.isPrivate():720:720 -> b
-    48:48:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):531 -> b
+    48:48:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):530 -> b
     49:49:boolean com.android.tools.r8.graph.DexClass.isPublic():724:724 -> b
-    49:49:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):531 -> b
+    49:49:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):530 -> b
     50:50:boolean com.android.tools.r8.graph.DexClass.isPublic():724:724 -> b
-    50:50:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):540 -> b
-    51:56:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):543:548 -> b
-    57:57:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():485:485 -> b
-    57:57:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):549 -> b
-    58:58:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):549:549 -> b
-    59:59:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():485:485 -> b
-    59:59:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):553 -> b
-    60:60:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):554:554 -> b
-    61:61:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():485:485 -> b
-    61:61:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):555 -> b
-    62:73:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):563:574 -> b
-    1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1000(com.android.tools.r8.shaking.VerticalClassMerger):113:113 -> c
-    2:64:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):768:830 -> c
-    1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedback access$1200(com.android.tools.r8.shaking.VerticalClassMerger):113:113 -> d
-    1:1:com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap access$1300(com.android.tools.r8.shaking.VerticalClassMerger):113:113 -> e
-    1:1:com.android.tools.r8.graph.DexApplication access$1400(com.android.tools.r8.shaking.VerticalClassMerger):113:113 -> f
-    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder access$1500(com.android.tools.r8.shaking.VerticalClassMerger):113:113 -> g
-    1:4:java.util.Collection com.android.tools.r8.shaking.VerticalClassMerger.getInvokes():578:581 -> h
-    1:4:java.util.Collection access$1600(com.android.tools.r8.shaking.VerticalClassMerger):113 -> h
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$200(com.android.tools.r8.shaking.VerticalClassMerger):113:113 -> i
-    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):113:113 -> j
-    1:1:java.util.concurrent.ExecutorService access$800(com.android.tools.r8.shaking.VerticalClassMerger):113:113 -> k
-    1:1:com.android.tools.r8.utils.Timing access$900(com.android.tools.r8.shaking.VerticalClassMerger):113:113 -> l
-com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.internal.Ws1:
-com.android.tools.r8.shaking.VerticalClassMerger$AbortReason$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Xs1:
+    50:50:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):539 -> b
+    51:56:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):542:547 -> b
+    57:57:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():427:427 -> b
+    57:57:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):548 -> b
+    58:58:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):548:548 -> b
+    59:59:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():427:427 -> b
+    59:59:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):552 -> b
+    60:60:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):553:553 -> b
+    61:61:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():427:427 -> b
+    61:61:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):554 -> b
+    62:73:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):562:573 -> b
+    1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1000(com.android.tools.r8.shaking.VerticalClassMerger):112:112 -> c
+    2:64:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):767:829 -> c
+    1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedback access$1200(com.android.tools.r8.shaking.VerticalClassMerger):112:112 -> d
+    1:1:com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap access$1300(com.android.tools.r8.shaking.VerticalClassMerger):112:112 -> e
+    1:1:com.android.tools.r8.graph.DexApplication access$1400(com.android.tools.r8.shaking.VerticalClassMerger):112:112 -> f
+    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder access$1500(com.android.tools.r8.shaking.VerticalClassMerger):112:112 -> g
+    1:4:java.util.Collection com.android.tools.r8.shaking.VerticalClassMerger.getInvokes():577:580 -> h
+    1:4:java.util.Collection access$1600(com.android.tools.r8.shaking.VerticalClassMerger):112 -> h
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$200(com.android.tools.r8.shaking.VerticalClassMerger):112:112 -> i
+    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):112:112 -> j
+    1:1:java.util.concurrent.ExecutorService access$800(com.android.tools.r8.shaking.VerticalClassMerger):112:112 -> k
+    1:1:com.android.tools.r8.utils.Timing access$900(com.android.tools.r8.shaking.VerticalClassMerger):112:112 -> l
+com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.internal.Ps1:
+com.android.tools.r8.shaking.VerticalClassMerger$AbortReason$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Qs1:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     boolean com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.$assertionsDisabled -> a
-    1:1:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.<clinit>():115:115 -> <clinit>
-    1:1:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137:137 -> a
-    2:2:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):201:201 -> a
-    2:2:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137 -> a
-    3:3:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):198:198 -> a
-    3:3:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137 -> a
-    4:4:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):195:195 -> a
-    4:4:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137 -> a
-    5:5:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):192:192 -> a
-    5:5:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137 -> a
-    6:6:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):189:189 -> a
-    6:6:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137 -> a
-    7:7:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):186:186 -> a
-    7:7:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137 -> a
-    8:8:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):183:183 -> a
-    8:8:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137 -> a
-    9:9:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):180:180 -> a
-    9:9:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137 -> a
-    10:10:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):177:177 -> a
-    10:10:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137 -> a
-    11:11:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):174:174 -> a
-    11:11:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137 -> a
-    12:12:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):171:171 -> a
-    12:12:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137 -> a
-    13:13:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):168:168 -> a
-    13:13:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137 -> a
-    14:14:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):165:165 -> a
-    14:14:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137 -> a
-    15:15:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):162:162 -> a
-    15:15:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137 -> a
-    16:16:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):159:159 -> a
-    16:16:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137 -> a
-    17:17:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):156:156 -> a
-    17:17:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137 -> a
-    18:18:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):153:153 -> a
-    18:18:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137 -> a
-    19:19:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):150:150 -> a
-    19:19:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137 -> a
-    20:20:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):147:147 -> a
-    20:20:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137 -> a
-    21:80:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):144:203 -> a
-    21:80:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137 -> a
-    81:81:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137:137 -> a
-    82:82:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):201:201 -> a
-    82:82:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137 -> a
-    83:83:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):142:142 -> a
-    83:83:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):137 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.internal.Ys1:
+    1:1:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.<clinit>():114:114 -> <clinit>
+    1:1:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136:136 -> a
+    2:2:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):200:200 -> a
+    2:2:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136 -> a
+    3:3:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):197:197 -> a
+    3:3:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136 -> a
+    4:4:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):194:194 -> a
+    4:4:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136 -> a
+    5:5:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):191:191 -> a
+    5:5:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136 -> a
+    6:6:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):188:188 -> a
+    6:6:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136 -> a
+    7:7:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):185:185 -> a
+    7:7:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136 -> a
+    8:8:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):182:182 -> a
+    8:8:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136 -> a
+    9:9:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):179:179 -> a
+    9:9:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136 -> a
+    10:10:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):176:176 -> a
+    10:10:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136 -> a
+    11:11:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):173:173 -> a
+    11:11:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136 -> a
+    12:12:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):170:170 -> a
+    12:12:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136 -> a
+    13:13:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):167:167 -> a
+    13:13:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136 -> a
+    14:14:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):164:164 -> a
+    14:14:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136 -> a
+    15:15:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):161:161 -> a
+    15:15:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136 -> a
+    16:16:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):158:158 -> a
+    16:16:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136 -> a
+    17:17:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):155:155 -> a
+    17:17:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136 -> a
+    18:18:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):152:152 -> a
+    18:18:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136 -> a
+    19:19:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):149:149 -> a
+    19:19:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136 -> a
+    20:20:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):146:146 -> a
+    20:20:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136 -> a
+    21:80:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):143:202 -> a
+    21:80:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136 -> a
+    81:81:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136:136 -> a
+    82:82:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):200:200 -> a
+    82:82:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136 -> a
+    83:83:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):141:141 -> a
+    83:83:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):136 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.internal.Rs1:
     com.android.tools.r8.graph.DexProgramClass target -> b
     java.util.List synthesizedBridges -> d
     com.android.tools.r8.graph.DexProgramClass source -> a
@@ -126357,138 +126609,133 @@ com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tool
     boolean $assertionsDisabled -> g
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> f
     com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder deferredRenamings -> c
-    1:1:void <clinit>():932:932 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.VerticalClassMerger$1):932:932 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):942:942 -> <init>
-    3:11:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):936:944 -> <init>
+    1:1:void <clinit>():931:931 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.VerticalClassMerger$1):931:931 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):941:941 -> <init>
+    3:11:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):935:943 -> <init>
     boolean lambda$getGenericSignatureArgumentApplier$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
     boolean lambda$getGenericSignatureArgumentApplier$6(com.android.tools.r8.graph.DexType) -> a
-    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):959:962 -> a
-    5:7:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1044:1046 -> a
-    8:8:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1045:1045 -> a
-    9:9:boolean lambda$merge$2(java.util.Set,com.android.tools.r8.graph.DexField):1111:1111 -> a
-    10:29:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1193:1212 -> a
+    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):958:961 -> a
+    5:7:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1043:1045 -> a
+    8:8:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1044:1044 -> a
+    9:9:boolean lambda$merge$2(java.util.Set,com.android.tools.r8.graph.DexField):1110:1110 -> a
+    10:29:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1192:1211 -> a
     30:33:com.android.tools.r8.graph.GenericSignature$ClassSignature com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier.visitClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):70:73 -> a
-    30:33:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1212 -> a
-    34:73:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1214:1253 -> a
+    30:33:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1211 -> a
+    34:73:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1213:1252 -> a
     74:75:void com.android.tools.r8.utils.CollectionUtils.forEach(java.util.function.Consumer,java.util.Collection[]):23:24 -> a
-    74:75:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1253 -> a
-    76:76:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1267:1267 -> a
-    77:84:void lambda$rewriteGenericSignatures$3(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):1255:1262 -> a
-    85:85:void lambda$rewriteGenericSignatures$3(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):1259:1259 -> a
-    86:90:void lambda$rewriteGenericSignatures$4(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedField):1269:1273 -> a
-    91:91:void lambda$rewriteGenericSignatures$4(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedField):1272:1272 -> a
-    92:113:com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier getGenericSignatureArgumentApplier(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):1279:1300 -> a
-    114:114:com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier getGenericSignatureArgumentApplier(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):1298:1298 -> a
-    115:127:boolean restoreDebuggingState(java.util.stream.Stream):1306:1318 -> a
-    128:128:boolean restoreDebuggingState(java.util.stream.Stream):1317:1317 -> a
-    129:130:void lambda$restoreDebuggingState$7(com.android.tools.r8.graph.DexEncodedMethod):1308:1309 -> a
-    131:131:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder getRenamings():1323:1323 -> a
-    132:194:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1331:1393 -> a
-    195:195:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$10(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1341:1341 -> a
-    196:199:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1518:1521 -> a
-    200:211:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1620:1631 -> a
-    200:211:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1522 -> a
-    212:215:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1630:1633 -> a
-    212:215:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1522 -> a
-    216:216:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.DexField):337:337 -> a
-    216:216:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1636 -> a
-    216:216:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1522 -> a
-    217:224:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1523:1530 -> a
-    225:229:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1539:1543 -> a
-    230:230:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1574:1574 -> a
-    231:259:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1584:1612 -> a
-    260:284:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1591:1615 -> a
-    285:285:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1589:1589 -> a
-    1:2:void lambda$restoreDebuggingState$8(com.android.tools.r8.graph.DexEncodedMethod):1313:1314 -> b
-    3:3:java.util.List getSynthesizedBridges():1327:1327 -> b
-    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$11(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1363:1363 -> b
-    1:2:boolean merge():951:952 -> c
-    3:4:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1501:1502 -> c
-    3:4:boolean merge():952 -> c
-    5:17:boolean merge():954:966 -> c
-    18:27:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1548:1557 -> c
-    18:27:boolean merge():968 -> c
-    28:35:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1556:1563 -> c
-    28:35:boolean merge():968 -> c
+    74:75:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1252 -> a
+    76:76:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1266:1266 -> a
+    77:84:void lambda$rewriteGenericSignatures$3(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):1254:1261 -> a
+    85:85:void lambda$rewriteGenericSignatures$3(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):1258:1258 -> a
+    86:90:void lambda$rewriteGenericSignatures$4(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedField):1268:1272 -> a
+    91:91:void lambda$rewriteGenericSignatures$4(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedField):1271:1271 -> a
+    92:113:com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier getGenericSignatureArgumentApplier(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):1278:1299 -> a
+    114:114:com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier getGenericSignatureArgumentApplier(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):1297:1297 -> a
+    115:127:boolean restoreDebuggingState(java.util.stream.Stream):1305:1317 -> a
+    128:128:boolean restoreDebuggingState(java.util.stream.Stream):1316:1316 -> a
+    129:130:void lambda$restoreDebuggingState$7(com.android.tools.r8.graph.DexEncodedMethod):1307:1308 -> a
+    131:131:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder getRenamings():1322:1322 -> a
+    132:194:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1330:1392 -> a
+    195:195:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$10(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1340:1340 -> a
+    196:199:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1516:1519 -> a
+    200:211:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1618:1629 -> a
+    200:211:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1520 -> a
+    212:215:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1628:1631 -> a
+    212:215:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1520 -> a
+    216:216:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.DexField):303:303 -> a
+    216:216:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1634 -> a
+    216:216:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1520 -> a
+    217:224:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1521:1528 -> a
+    225:229:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1537:1541 -> a
+    230:230:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1572:1572 -> a
+    231:259:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1582:1610 -> a
+    260:284:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1589:1613 -> a
+    285:285:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1587:1587 -> a
+    1:2:void lambda$restoreDebuggingState$8(com.android.tools.r8.graph.DexEncodedMethod):1312:1313 -> b
+    3:3:java.util.List getSynthesizedBridges():1326:1326 -> b
+    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$11(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1362:1362 -> b
+    1:2:boolean merge():950:951 -> c
+    3:4:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1499:1500 -> c
+    3:4:boolean merge():951 -> c
+    5:17:boolean merge():953:965 -> c
+    18:27:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1546:1555 -> c
+    18:27:boolean merge():967 -> c
+    28:35:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1554:1561 -> c
+    28:35:boolean merge():967 -> c
     36:36:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
-    36:36:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1563 -> c
-    36:36:boolean merge():968 -> c
-    37:41:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1564:1568 -> c
-    37:41:boolean merge():968 -> c
-    42:42:boolean merge():969:969 -> c
-    43:43:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1496:1496 -> c
-    43:43:boolean merge():969 -> c
-    44:44:boolean merge():970:970 -> c
-    45:45:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1416:1416 -> c
-    45:45:boolean merge():970 -> c
-    46:46:boolean merge():976:976 -> c
-    47:51:boolean merge():973:977 -> c
-    52:52:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1496:1496 -> c
-    52:52:boolean merge():977 -> c
-    53:53:boolean merge():978:978 -> c
+    36:36:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1561 -> c
+    36:36:boolean merge():967 -> c
+    37:41:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1562:1566 -> c
+    37:41:boolean merge():967 -> c
+    42:42:boolean merge():968:968 -> c
+    43:43:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1494:1494 -> c
+    43:43:boolean merge():968 -> c
+    44:44:boolean merge():969:969 -> c
+    45:45:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1415:1415 -> c
+    45:45:boolean merge():969 -> c
+    46:46:boolean merge():975:975 -> c
+    47:51:boolean merge():972:976 -> c
+    52:52:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1494:1494 -> c
+    52:52:boolean merge():976 -> c
+    53:53:boolean merge():977:977 -> c
     54:54:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
-    54:54:boolean merge():978 -> c
-    55:57:boolean merge():979:979 -> c
-    59:59:boolean merge():981:981 -> c
-    60:60:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1416:1416 -> c
-    60:60:boolean merge():981 -> c
-    61:61:boolean merge():985:985 -> c
-    62:83:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1466:1487 -> c
-    62:83:boolean merge():986 -> c
-    84:84:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1482:1482 -> c
-    84:84:boolean merge():986 -> c
-    85:87:boolean merge():988:990 -> c
+    54:54:boolean merge():977 -> c
+    55:57:boolean merge():978:978 -> c
+    59:59:boolean merge():980:980 -> c
+    60:60:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1415:1415 -> c
+    60:60:boolean merge():980 -> c
+    61:61:boolean merge():984:984 -> c
+    62:83:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1464:1485 -> c
+    62:83:boolean merge():985 -> c
+    84:84:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1480:1480 -> c
+    84:84:boolean merge():985 -> c
+    85:87:boolean merge():987:989 -> c
     88:88:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
-    88:88:boolean merge():990 -> c
-    89:98:boolean merge():994:1003 -> c
-    99:118:boolean merge():1002:1021 -> c
-    119:122:boolean merge():1020:1023 -> c
+    88:88:boolean merge():989 -> c
+    89:98:boolean merge():993:1002 -> c
+    99:118:boolean merge():1001:1020 -> c
+    119:122:boolean merge():1019:1022 -> c
     123:123:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
-    123:123:boolean merge():1022 -> c
-    124:126:boolean merge():1024:1024 -> c
-    128:128:boolean merge():1026:1026 -> c
-    129:129:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1496:1496 -> c
-    129:129:boolean merge():1026 -> c
-    130:146:boolean merge():1032:1048 -> c
-    147:147:boolean merge():1041:1041 -> c
-    148:152:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1640:1644 -> c
-    148:152:boolean merge():1049 -> c
-    153:163:boolean merge():1052:1062 -> c
-    164:164:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1496:1496 -> c
-    164:164:boolean merge():1062 -> c
-    165:165:boolean merge():1067:1067 -> c
-    166:168:boolean merge():1066:1068 -> c
-    169:169:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1416:1416 -> c
-    169:169:boolean merge():1068 -> c
-    170:203:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1421:1454 -> c
-    170:203:boolean merge():1076 -> c
-    204:204:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):277:277 -> c
-    204:204:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1454 -> c
-    204:204:boolean merge():1076 -> c
-    205:209:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1455:1459 -> c
-    205:209:boolean merge():1076 -> c
-    210:212:boolean merge():1077:1077 -> c
-    214:214:boolean merge():1079:1079 -> c
-    215:215:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1496:1496 -> c
-    215:215:boolean merge():1079 -> c
-    216:216:boolean merge():1082:1082 -> c
-    217:217:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
-    217:217:boolean merge():1082 -> c
-    218:220:boolean merge():1083:1083 -> c
-    224:226:boolean merge():1087:1089 -> c
-    227:255:boolean merge():1088:1116 -> c
-    256:265:boolean merge():1114:1123 -> c
-    266:273:boolean merge():1121:1128 -> c
-    274:276:java.util.Set com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.mergeArrays(java.lang.Object[],java.lang.Object[]):1507:1509 -> c
-    274:276:boolean merge():1128 -> c
-    277:310:boolean merge():1131:1164 -> c
-    311:324:com.android.tools.r8.graph.GenericSignatureContextBuilder com.android.tools.r8.graph.GenericSignatureContextBuilder.createForSingleClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):185:198 -> c
-    311:324:boolean merge():1164 -> c
-    325:329:boolean merge():1163:1163 -> c
-    330:330:boolean lambda$restoreDebuggingState$9(com.android.tools.r8.graph.DexEncodedMethod):1318:1318 -> c
-    331:331:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$12(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1387:1387 -> c
-com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.internal.Zs1:
+    123:123:boolean merge():1021 -> c
+    124:126:boolean merge():1023:1023 -> c
+    128:128:boolean merge():1025:1025 -> c
+    129:129:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1494:1494 -> c
+    129:129:boolean merge():1025 -> c
+    130:146:boolean merge():1031:1047 -> c
+    147:147:boolean merge():1040:1040 -> c
+    148:152:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1638:1642 -> c
+    148:152:boolean merge():1048 -> c
+    153:163:boolean merge():1051:1061 -> c
+    164:164:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1494:1494 -> c
+    164:164:boolean merge():1061 -> c
+    165:165:boolean merge():1066:1066 -> c
+    166:168:boolean merge():1065:1067 -> c
+    169:169:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1415:1415 -> c
+    169:169:boolean merge():1067 -> c
+    170:207:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1420:1457 -> c
+    170:207:boolean merge():1075 -> c
+    208:210:boolean merge():1076:1076 -> c
+    212:212:boolean merge():1078:1078 -> c
+    213:213:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1494:1494 -> c
+    213:213:boolean merge():1078 -> c
+    214:214:boolean merge():1081:1081 -> c
+    215:215:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
+    215:215:boolean merge():1081 -> c
+    216:218:boolean merge():1082:1082 -> c
+    222:224:boolean merge():1086:1088 -> c
+    225:253:boolean merge():1087:1115 -> c
+    254:263:boolean merge():1113:1122 -> c
+    264:271:boolean merge():1120:1127 -> c
+    272:274:java.util.Set com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.mergeArrays(java.lang.Object[],java.lang.Object[]):1505:1507 -> c
+    272:274:boolean merge():1127 -> c
+    275:308:boolean merge():1130:1163 -> c
+    309:322:com.android.tools.r8.graph.GenericSignatureContextBuilder com.android.tools.r8.graph.GenericSignatureContextBuilder.createForSingleClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):185:198 -> c
+    309:322:boolean merge():1163 -> c
+    323:327:boolean merge():1162:1162 -> c
+    328:328:boolean lambda$restoreDebuggingState$9(com.android.tools.r8.graph.DexEncodedMethod):1317:1317 -> c
+    329:329:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$12(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1386:1386 -> c
+com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.internal.Ss1:
     java.util.Map seenPositions -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap sourceProtoCache -> c
     java.util.Collection invokes -> f
@@ -126497,124 +126744,126 @@ com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.androi
     boolean $assertionsDisabled -> h
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> g
     com.android.tools.r8.graph.DexType target -> e
-    1:1:void <clinit>():1735:1735 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$1):1735:1735 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1746:1746 -> <init>
-    3:15:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1740:1752 -> <init>
-    1:18:void fillSeenPositions():1782:1799 -> a
-    19:20:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1789:1790 -> a
-    21:52:int computePositionsFor(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1809:1840 -> a
-    1:22:boolean mayCollide():1756:1777 -> b
-com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.internal.at1:
-    com.android.tools.r8.graph.AppView appView -> e
-    boolean $assertionsDisabled -> g
-    com.android.tools.r8.graph.DexClass source -> f
-    boolean foundIllegalAccess -> c
-    com.android.tools.r8.graph.ProgramMethod context -> d
-    1:1:void <clinit>():1982:1982 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1992:1994 -> <init>
-    1:1:boolean foundIllegalAccess():1998:1998 -> a
-    2:2:void setContext(com.android.tools.r8.graph.ProgramMethod):2002:2002 -> a
-    3:5:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2022:2024 -> a
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):352:352 -> a
-    6:6:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2024 -> a
-    7:18:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2025:2036 -> a
-    19:19:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():485:485 -> a
-    19:19:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2036 -> a
-    20:20:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2037:2037 -> a
-    21:24:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):2071:2074 -> a
-    25:25:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):2108:2108 -> a
-    1:4:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):2087:2090 -> b
-    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):2058:2058 -> c
-    2:5:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):2079:2082 -> c
-    6:6:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):2103:2103 -> c
-    1:4:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):2095:2098 -> d
-    5:5:void registerInstanceOf(com.android.tools.r8.graph.DexType):2133:2133 -> d
-    1:4:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):2063:2066 -> e
-    5:5:void registerNewInstance(com.android.tools.r8.graph.DexType):2113:2113 -> e
-    6:6:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):2118:2118 -> e
-    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):2123:2123 -> g
-    2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):2128:2128 -> g
-    1:3:void checkTypeReference(com.android.tools.r8.graph.DexType):2044:2046 -> h
+    1:1:void <clinit>():1733:1733 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$1):1733:1733 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1744:1744 -> <init>
+    3:15:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1738:1750 -> <init>
+    1:18:void fillSeenPositions():1780:1797 -> a
+    19:20:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1787:1788 -> a
+    21:52:int computePositionsFor(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1807:1838 -> a
+    1:22:boolean mayCollide():1754:1775 -> b
+com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.internal.Ts1:
+    com.android.tools.r8.graph.ProgramMethod context -> e
+    com.android.tools.r8.graph.AppView appView -> f
+    com.android.tools.r8.graph.DexClass source -> g
+    boolean $assertionsDisabled -> h
+    boolean foundIllegalAccess -> d
+    1:1:void <clinit>():1980:1980 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1990:1992 -> <init>
+    1:1:void setContext(com.android.tools.r8.graph.ProgramMethod):2000:2000 -> a
+    2:4:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2020:2022 -> a
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):352:352 -> a
+    5:5:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2022 -> a
+    6:17:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2023:2034 -> a
+    18:18:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():427:427 -> a
+    18:18:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2034 -> a
+    19:19:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2035:2035 -> a
+    20:23:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):2069:2072 -> a
+    24:24:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):2106:2106 -> a
+    1:4:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):2085:2088 -> b
+    1:1:boolean foundIllegalAccess():1996:1996 -> c
+    2:2:void registerInitClass(com.android.tools.r8.graph.DexType):2056:2056 -> c
+    3:6:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):2077:2080 -> c
+    7:7:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):2101:2101 -> c
+    1:4:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):2093:2096 -> d
+    5:5:void registerInstanceOf(com.android.tools.r8.graph.DexType):2131:2131 -> d
+    1:4:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):2061:2064 -> e
+    5:5:void registerNewInstance(com.android.tools.r8.graph.DexType):2111:2111 -> e
+    6:6:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):2116:2116 -> e
+    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):2121:2121 -> g
+    2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):2126:2126 -> g
+    1:3:void checkTypeReference(com.android.tools.r8.graph.DexType):2042:2044 -> h
     4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):352:352 -> h
-    4:4:void checkTypeReference(com.android.tools.r8.graph.DexType):2046 -> h
-    5:8:void checkTypeReference(com.android.tools.r8.graph.DexType):2047:2050 -> h
-    1:3:void checkFieldReference(com.android.tools.r8.graph.DexField):2006:2008 -> i
+    4:4:void checkTypeReference(com.android.tools.r8.graph.DexType):2044 -> h
+    5:8:void checkTypeReference(com.android.tools.r8.graph.DexType):2045:2048 -> h
+    1:3:void checkFieldReference(com.android.tools.r8.graph.DexField):2004:2006 -> i
     4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):352:352 -> i
-    4:4:void checkFieldReference(com.android.tools.r8.graph.DexField):2008 -> i
-    5:11:void checkFieldReference(com.android.tools.r8.graph.DexField):2009:2015 -> i
-com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.internal.bt1:
+    4:4:void checkFieldReference(com.android.tools.r8.graph.DexField):2006 -> i
+    5:11:void checkFieldReference(com.android.tools.r8.graph.DexField):2007:2013 -> i
+com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.internal.Us1:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
     java.util.Set mergeeCandidates -> c
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap cache -> a
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):592:592 -> <init>
-    2:10:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):587:595 -> <init>
-    1:35:java.util.Collection get():600:634 -> a
-    36:36:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):618:618 -> a
-    37:51:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):642:656 -> a
-    52:59:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):662:669 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLens -> com.android.tools.r8.internal.ct1:
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):591:591 -> <init>
+    2:10:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):586:594 -> <init>
+    1:35:java.util.Collection get():599:633 -> a
+    36:36:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):617:617 -> a
+    37:51:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):641:655 -> a
+    52:59:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):661:668 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLens -> com.android.tools.r8.internal.Vs1:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> h
     com.android.tools.r8.graph.DexProgramClass target -> g
     com.android.tools.r8.graph.DexType source -> f
-    1:1:void <clinit>():1872:1872 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1877:1880 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1885:1885 -> a
-    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1895:1895 -> a
-    3:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1900:1900 -> a
-    4:4:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):1910:1910 -> a
-    5:25:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1927:1947 -> a
-    26:26:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1954:1954 -> a
-    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):1890:1890 -> b
-    2:2:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1905:1905 -> b
-    3:3:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1971:1971 -> b
-    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1965:1965 -> c
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):1960:1960 -> d
-    1:1:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):1915:1915 -> e
+    1:1:void <clinit>():1870:1870 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1875:1878 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1883:1883 -> a
+    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1893:1893 -> a
+    3:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1898:1898 -> a
+    4:4:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):1908:1908 -> a
+    5:25:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1925:1945 -> a
+    26:26:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1952:1952 -> a
+    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):1888:1888 -> b
+    2:2:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1903:1903 -> b
+    3:3:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1969:1969 -> b
+    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1963:1963 -> c
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):1958:1958 -> d
+    1:1:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):1913:1913 -> e
     boolean isContextFreeForMethods() -> f
-    1:1:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):1920:1920 -> f
-com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.internal.dt1:
+    1:1:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):1918:1918 -> f
+com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.internal.Ws1:
     com.android.tools.r8.ir.code.Invoke$Type type -> f
     com.android.tools.r8.graph.DexMethod invocationTarget -> e
     boolean isInterface -> g
     com.android.tools.r8.graph.DexMethod originalMethod -> d
+    boolean $assertionsDisabled -> h
     com.android.tools.r8.graph.DexMethod method -> c
-    1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):2150:2155 -> <init>
-    1:1:java.util.function.Consumer getRegistryCallback():2190:2190 -> X
-    1:2:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2176:2177 -> Y
+    1:1:void <clinit>():2135:2135 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):2148:2153 -> <init>
+    1:1:java.util.function.Consumer getRegistryCallback():2188:2188 -> X
+    1:2:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2174:2175 -> Y
     3:3:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):25:25 -> Y
-    3:3:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2177 -> Y
-    4:11:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2178:2185 -> Y
-    1:1:com.android.tools.r8.graph.DexMethod access$500(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):2137:2137 -> a
-    2:3:void updateMethodSignatures(java.util.function.Function):2170:2171 -> a
-    4:14:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2191:2201 -> a
-    15:15:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2193:2193 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer -> com.android.tools.r8.internal.et1:
+    3:3:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2175 -> Y
+    4:11:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2176:2183 -> Y
+    1:1:com.android.tools.r8.graph.DexMethod access$500(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):2135:2135 -> a
+    2:3:void updateMethodSignatures(java.util.function.Function):2168:2169 -> a
+    4:15:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2189:2200 -> a
+    16:16:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2192:2192 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer -> com.android.tools.r8.internal.Xs1:
     com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder lensBuilder -> g
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.AppView appView -> f
     com.android.tools.r8.graph.classmerging.VerticallyMergedClasses mergedClasses -> h
     java.util.List synthesizedBridges -> i
-    1:1:void <clinit>():1656:1656 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,java.util.List):1668:1673 -> <init>
-    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLens access$400(com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer):1656:1656 -> a
-    2:2:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1704:1704 -> a
-    3:3:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1709:1709 -> a
+    1:1:void <clinit>():1654:1654 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,java.util.List):1666:1671 -> <init>
+    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLens access$400(com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer):1654:1654 -> a
+    2:2:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1702:1702 -> a
+    3:3:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1707:1707 -> a
     4:4:boolean com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexField):299:299 -> a
-    4:4:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1709 -> a
-    5:5:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1710:1710 -> a
+    4:4:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1707 -> a
+    5:5:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1708:1708 -> a
     6:6:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):312:312 -> a
-    6:6:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1710 -> a
-    7:8:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1716:1717 -> a
+    6:6:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1708 -> a
+    7:8:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1714:1715 -> a
     9:9:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> a
-    9:9:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1717 -> a
-    10:10:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1717:1717 -> a
-    11:16:com.android.tools.r8.graph.DexEncodedMethod recordMethodChange(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1724:1729 -> a
-    1:11:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1678:1688 -> b
-    12:13:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):1695:1696 -> b
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens -> com.android.tools.r8.internal.jt1:
+    9:9:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1715 -> a
+    10:10:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1715:1715 -> a
+    11:16:com.android.tools.r8.graph.DexEncodedMethod recordMethodChange(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1722:1727 -> a
+    1:11:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1676:1686 -> b
+    12:13:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):1693:1694 -> b
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens -> com.android.tools.r8.internal.ct1:
     com.android.tools.r8.graph.AppView appView -> n
     java.util.Map originalMethodSignaturesForBridges -> r
     java.util.Map contextualVirtualToDirectMethodMaps -> p
@@ -126638,8 +126887,8 @@ com.android.tools.r8.shaking.VerticalClassMergerGraphLens -> com.android.tools.r
     1:2:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):89:90 -> g
     3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> g
     3:3:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):94 -> g
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens$1 -> com.android.tools.r8.internal.gt1:
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.ht1:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens$1 -> com.android.tools.r8.internal.Zs1:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.at1:
     java.util.Map methodMap -> c
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newMethodSignatures -> f
     boolean $assertionsDisabled -> i
@@ -126683,9 +126932,9 @@ com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder -> com.android
     107:120:void merge(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$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.VerticalClassMergerGraphLens$GraphLensLookupResultProvider -> com.android.tools.r8.internal.it1:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens$GraphLensLookupResultProvider -> com.android.tools.r8.internal.bt1:
     com.android.tools.r8.graph.GraphLens$MethodLookupResult get(com.android.tools.r8.graph.RewrittenPrototypeDescription) -> a
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.internal.zt1:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.internal.st1:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():43:43 -> <clinit>
     1:1:void <init>(com.android.tools.r8.experimental.graphinfo.GraphConsumer):58:58 -> <init>
@@ -126722,7 +126971,7 @@ com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.in
     35:39:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):230 -> d
     40:46:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):230:236 -> d
     47:47:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):235:235 -> d
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> com.android.tools.r8.internal.xt1:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> com.android.tools.r8.internal.qt1:
     java.io.PrintStream output -> a
     int indentation -> b
     1:1:void <init>(java.io.PrintStream):257:257 -> <init>
@@ -126732,7 +126981,7 @@ com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> com.android.t
     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.internal.yt1:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.internal.rt1:
     com.android.tools.r8.experimental.graphinfo.GraphNode node -> a
     com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath path -> b
     boolean $assertionsDisabled -> c
@@ -126866,11 +127115,11 @@ com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder -> com.andr
     2:12:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder collectSyntheticInputs():110:120 -> b
     1:1:java.util.List lambda$addNonLegacyClass$0(com.android.tools.r8.graph.DexType):60:60 -> c
     1:1:java.util.List lambda$addNonLegacyMethod$1(com.android.tools.r8.graph.DexType):74:74 -> d
-com.android.tools.r8.synthesis.LegacySyntheticDefinition -> com.android.tools.r8.internal.u41:
+com.android.tools.r8.synthesis.LegacySyntheticDefinition -> com.android.tools.r8.internal.x41:
     com.android.tools.r8.graph.DexProgramClass getDefinition() -> a
-com.android.tools.r8.synthesis.LegacySyntheticReference -> com.android.tools.r8.internal.v41:
+com.android.tools.r8.synthesis.LegacySyntheticReference -> com.android.tools.r8.internal.y41:
     com.android.tools.r8.FeatureSplit getFeatureSplit() -> b
-com.android.tools.r8.synthesis.Rewritable -> com.android.tools.r8.internal.Zl1:
+com.android.tools.r8.synthesis.Rewritable -> com.android.tools.r8.internal.Xl1:
     com.android.tools.r8.graph.DexType getHolder() -> a
     com.android.tools.r8.synthesis.Rewritable rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens) -> a
 com.android.tools.r8.synthesis.SynthesizingContext -> com.android.tools.r8.synthesis.d:
@@ -126904,7 +127153,7 @@ com.android.tools.r8.synthesis.SynthesizingContext -> com.android.tools.r8.synth
     27:27:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):116 -> a
     28:30:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):118:120 -> a
     31:31:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128:128 -> a
-    32:32:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():437:437 -> a
+    32:32:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():443:443 -> a
     32:32:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> a
     33:53:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):131:151 -> a
     54:54:boolean isDerivedFromMainDexList(com.android.tools.r8.shaking.MainDexInfo):164:164 -> a
@@ -127016,7 +127265,7 @@ com.android.tools.r8.synthesis.SyntheticClasspathClassReference -> com.android.t
     10:10:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):18 -> a
     11:14:com.android.tools.r8.synthesis.SyntheticClasspathClassReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):39:42 -> a
     11:14:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):18 -> a
-com.android.tools.r8.synthesis.SyntheticClasspathDefinition -> com.android.tools.r8.internal.cq1:
+com.android.tools.r8.synthesis.SyntheticClasspathDefinition -> com.android.tools.r8.internal.Up1:
 com.android.tools.r8.synthesis.SyntheticDefinition -> com.android.tools.r8.synthesis.k:
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind kind -> a
     boolean $assertionsDisabled -> c
@@ -127066,7 +127315,7 @@ com.android.tools.r8.synthesis.SyntheticDefinition -> com.android.tools.r8.synth
     boolean isProgramDefinition() -> i
     boolean isValid() -> j
     com.android.tools.r8.synthesis.SyntheticReference toReference() -> k
-com.android.tools.r8.synthesis.SyntheticDefinitionsProvider -> com.android.tools.r8.internal.dq1:
+com.android.tools.r8.synthesis.SyntheticDefinitionsProvider -> com.android.tools.r8.internal.Vp1:
     com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function) -> a
 com.android.tools.r8.synthesis.SyntheticFinalization -> com.android.tools.r8.synthesis.p:
     com.android.tools.r8.utils.InternalOptions options -> a
@@ -127140,7 +127389,7 @@ com.android.tools.r8.synthesis.SyntheticFinalization -> com.android.tools.r8.syn
     331:331:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):536:536 -> a
     332:332:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.utils.InternalOptions):82:82 -> a
     332:332:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):536 -> a
-    333:333:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    333:333:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     333:333:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.utils.InternalOptions):82 -> a
     333:333:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):536 -> a
     334:339:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.utils.InternalOptions):82:87 -> a
@@ -127156,7 +127405,7 @@ com.android.tools.r8.synthesis.SyntheticFinalization -> com.android.tools.r8.syn
     361:417:java.util.Map computeActualEquivalences(java.util.Collection,java.util.Map,com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticFinalization$Builder):554:610 -> a
     418:418:java.util.List lambda$computeActualEquivalences$18(java.lang.String):572:572 -> a
     419:419:void lambda$computeActualEquivalences$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,boolean,java.util.Map,java.util.Map,java.lang.String,java.util.List):581:581 -> a
-    420:420:void com.android.tools.r8.utils.ListUtils.destructiveSort(java.util.List,java.util.Comparator):239:239 -> a
+    420:420:void com.android.tools.r8.utils.ListUtils.destructiveSort(java.util.List,java.util.Comparator):247:247 -> a
     420:420:void lambda$computeActualEquivalences$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,boolean,java.util.Map,java.util.Map,java.lang.String,java.util.List):583 -> a
     421:426:void lambda$computeActualEquivalences$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,boolean,java.util.Map,java.util.Map,java.lang.String,java.util.List):584:589 -> a
     427:435:void lambda$computeActualEquivalences$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.features.ClassToFeatureSplitMap,boolean,java.util.Map,java.util.Map,java.lang.String,java.util.List):586:594 -> a
@@ -127233,7 +127482,7 @@ com.android.tools.r8.synthesis.SyntheticFinalization -> com.android.tools.r8.syn
     5:5:com.android.tools.r8.graph.DexApplication com.android.tools.r8.synthesis.CommittedItems.getApplication():50:50 -> d
     5:5:void finalizeWithLiveness(com.android.tools.r8.graph.AppView):197 -> d
     6:6:void finalizeWithLiveness(com.android.tools.r8.graph.AppView):197:197 -> d
-    7:7:void com.android.tools.r8.graph.AppView.rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):683:683 -> d
+    7:7:void com.android.tools.r8.graph.AppView.rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):688:688 -> d
     7:7:void finalizeWithLiveness(com.android.tools.r8.graph.AppView):197 -> d
     8:8:void finalizeWithLiveness(com.android.tools.r8.graph.AppView):199:199 -> d
     9:9:com.android.tools.r8.graph.DexApplication com.android.tools.r8.synthesis.CommittedItems.getApplication():50:50 -> d
@@ -127281,12 +127530,12 @@ com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup -> com.and
     2:3:com.android.tools.r8.synthesis.SyntheticDefinition getRepresentative():839:840 -> b
     1:1:boolean hasRepresentative():844:844 -> c
     1:13:void selectDeterministicRepresentative():860:872 -> d
-    14:14:java.lang.Object com.android.tools.r8.utils.ListUtils.removeLast(java.util.List):208:208 -> d
+    14:14:java.lang.Object com.android.tools.r8.utils.ListUtils.removeLast(java.util.List):216:216 -> d
     14:14:void selectDeterministicRepresentative():872 -> d
     15:16:void setRepresentative(com.android.tools.r8.synthesis.SyntheticDefinition):877:878 -> d
     15:16:void selectDeterministicRepresentative():873 -> d
     1:8:java.lang.String toString():883:890 -> toString
-com.android.tools.r8.synthesis.SyntheticFinalization$Result -> com.android.tools.r8.internal.eq1:
+com.android.tools.r8.synthesis.SyntheticFinalization$Result -> com.android.tools.r8.internal.Wp1:
     com.android.tools.r8.synthesis.CommittedItems commit -> a
     com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens lens -> b
     com.android.tools.r8.shaking.MainDexInfo mainDexInfo -> d
@@ -127314,7 +127563,7 @@ com.android.tools.r8.synthesis.SyntheticItems -> com.android.tools.r8.synthesis.
     9:9:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):138 -> a
     10:17:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):140:147 -> a
     18:20:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):146:148 -> a
-    21:21:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():478:478 -> a
+    21:21:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():479:479 -> a
     21:21:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):150 -> a
     22:22:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):150:150 -> a
     23:23:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():760:760 -> a
@@ -127462,7 +127711,7 @@ com.android.tools.r8.synthesis.SyntheticItems -> com.android.tools.r8.synthesis.
     422:422:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):842 -> a
     423:434:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):842:853 -> a
     435:435:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):868:868 -> a
-    436:436:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    436:436:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     436:436:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):868 -> a
     437:444:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):871:878 -> a
     445:445:void com.android.tools.r8.synthesis.SyntheticMarker.writeMarkerAttribute(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):33:33 -> a
@@ -127508,7 +127757,7 @@ com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics -> com.android.t
     18:19:java.util.Collection getAllProgramClasses():100:101 -> a
     1:1:java.util.concurrent.ConcurrentHashMap access$200(com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics):61:61 -> b
     2:2:boolean isEmpty():74:74 -> b
-com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle -> com.android.tools.r8.internal.iq1:
+com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle -> com.android.tools.r8.internal.aq1:
     java.util.Set getSynthesizingContexts(com.android.tools.r8.graph.DexProgramClass) -> a
 com.android.tools.r8.synthesis.SyntheticMarker -> com.android.tools.r8.synthesis.u:
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind kind -> a
@@ -127587,24 +127836,21 @@ com.android.tools.r8.synthesis.SyntheticMethodBuilder -> com.android.tools.r8.sy
     11:11:com.android.tools.r8.synthesis.SyntheticMethodBuilder setParameterAnnotationsList(com.android.tools.r8.graph.ParameterAnnotationsList):96:96 -> a
     12:12:com.android.tools.r8.graph.DexEncodedMethod build():106:106 -> a
     13:13:com.android.tools.r8.graph.DexMethod getMethodSignature():152:152 -> a
-    13:13:com.android.tools.r8.graph.DexEncodedMethod build():108 -> a
+    13:13:com.android.tools.r8.graph.DexEncodedMethod build():107 -> a
     14:14:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():156:156 -> a
-    14:14:com.android.tools.r8.graph.DexEncodedMethod build():109 -> a
-    15:22:com.android.tools.r8.graph.DexEncodedMethod build():110:117 -> a
-    23:23:com.android.tools.r8.graph.Code getCodeObject(com.android.tools.r8.graph.DexMethod):160:160 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod build():117 -> a
-    24:24:com.android.tools.r8.graph.DexEncodedMethod build():117:117 -> a
-    25:25:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):277:277 -> a
-    25:25:com.android.tools.r8.graph.DexEncodedMethod build():117 -> a
-    26:26:com.android.tools.r8.graph.DexEncodedMethod build():122:122 -> a
-    27:27:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):140:140 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod build():122 -> a
-    28:28:com.android.tools.r8.graph.DexEncodedMethod build():122:122 -> a
-    29:30:boolean isValidSingleSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):144:145 -> a
-    31:31:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():485:485 -> a
-    31:31:boolean isValidSingleSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):146 -> a
-    32:33:boolean isValidSingleSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):147:148 -> a
-com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator -> com.android.tools.r8.internal.lq1:
+    14:14:com.android.tools.r8.graph.DexEncodedMethod build():108 -> a
+    15:15:com.android.tools.r8.graph.DexEncodedMethod build():109:109 -> a
+    16:16:com.android.tools.r8.graph.Code getCodeObject(com.android.tools.r8.graph.DexMethod):160:160 -> a
+    16:16:com.android.tools.r8.graph.DexEncodedMethod build():109 -> a
+    17:28:com.android.tools.r8.graph.DexEncodedMethod build():111:122 -> a
+    29:29:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):140:140 -> a
+    29:29:com.android.tools.r8.graph.DexEncodedMethod build():122 -> a
+    30:30:com.android.tools.r8.graph.DexEncodedMethod build():122:122 -> a
+    31:32:boolean isValidSingleSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):144:145 -> a
+    33:33:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():427:427 -> a
+    33:33:boolean isValidSingleSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):146 -> a
+    34:35:boolean isValidSingleSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):147:148 -> a
+com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator -> com.android.tools.r8.internal.dq1:
     com.android.tools.r8.graph.Code generate(com.android.tools.r8.graph.DexMethod) -> a
 com.android.tools.r8.synthesis.SyntheticMethodDefinition -> com.android.tools.r8.synthesis.w:
     com.android.tools.r8.graph.ProgramMethod method -> d
@@ -127858,7 +128104,7 @@ com.android.tools.r8.synthesis.SyntheticProgramClassReference -> com.android.too
     8:8:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):19 -> a
     9:15:com.android.tools.r8.synthesis.SyntheticProgramClassReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):44:50 -> a
     9:15:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):19 -> a
-com.android.tools.r8.synthesis.SyntheticProgramDefinition -> com.android.tools.r8.internal.mq1:
+com.android.tools.r8.synthesis.SyntheticProgramDefinition -> com.android.tools.r8.internal.eq1:
     void apply(java.util.function.Consumer,java.util.function.Consumer) -> a
     com.android.tools.r8.graph.DexProgramClass getHolder() -> a
 com.android.tools.r8.synthesis.SyntheticReference -> com.android.tools.r8.synthesis.C:
@@ -128306,12 +128552,12 @@ com.android.tools.r8.tracereferences.Tracer$UseCollector -> com.android.tools.r8
     1:1:com.android.tools.r8.DiagnosticsHandler access$500(com.android.tools.r8.tracereferences.Tracer$UseCollector):119:119 -> b
     1:1:com.android.tools.r8.tracereferences.TraceReferencesConsumer access$600(com.android.tools.r8.tracereferences.Tracer$UseCollector):119:119 -> c
 com.android.tools.r8.tracereferences.Tracer$UseCollector$MethodUseCollector -> com.android.tools.r8.tracereferences.k:
-    com.android.tools.r8.graph.GraphLens graphLens -> d
-    com.android.tools.r8.diagnostic.DefinitionContext referencedFrom -> f
-    com.android.tools.r8.tracereferences.Tracer$UseCollector this$0 -> g
-    boolean $assertionsDisabled -> h
-    com.android.tools.r8.graph.InitClassLens initClassLens -> e
-    com.android.tools.r8.graph.ProgramMethod context -> c
+    com.android.tools.r8.graph.GraphLens graphLens -> e
+    com.android.tools.r8.graph.InitClassLens initClassLens -> f
+    boolean $assertionsDisabled -> i
+    com.android.tools.r8.tracereferences.Tracer$UseCollector this$0 -> h
+    com.android.tools.r8.graph.ProgramMethod context -> d
+    com.android.tools.r8.diagnostic.DefinitionContext referencedFrom -> g
     1:1:void <clinit>():282:282 -> <clinit>
     1:6:void <init>(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens):290:295 -> <init>
     1:1:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):302:302 -> a
@@ -128378,15 +128624,15 @@ com.android.tools.r8.tracereferences.internal.AccessFlagsImpl -> com.android.too
     1:1:boolean isProtected():29:29 -> isProtected
     1:1:boolean isPublic():24:24 -> isPublic
     1:1:boolean isStatic():19:19 -> isStatic
-com.android.tools.r8.tracereferences.internal.ClassAccessFlagsImpl -> com.android.tools.r8.internal.cG0:
+com.android.tools.r8.tracereferences.internal.ClassAccessFlagsImpl -> com.android.tools.r8.internal.fG0:
     1:1:void <init>(com.android.tools.r8.graph.ClassAccessFlags):13:13 -> <init>
     1:1:boolean isEnum():23:23 -> isEnum
     1:1:boolean isInterface():18:18 -> isInterface
-com.android.tools.r8.tracereferences.internal.FieldAccessFlagsImpl -> com.android.tools.r8.internal.DO0:
+com.android.tools.r8.tracereferences.internal.FieldAccessFlagsImpl -> com.android.tools.r8.internal.GO0:
     1:1:void <init>(com.android.tools.r8.graph.FieldAccessFlags):13:13 -> <init>
-com.android.tools.r8.tracereferences.internal.MethodAccessFlagsImpl -> com.android.tools.r8.internal.n71:
+com.android.tools.r8.tracereferences.internal.MethodAccessFlagsImpl -> com.android.tools.r8.internal.q71:
     1:1:void <init>(com.android.tools.r8.graph.MethodAccessFlags):13:13 -> <init>
-com.android.tools.r8.tracereferences.internal.TraceReferencesResult -> com.android.tools.r8.internal.Vq1:
+com.android.tools.r8.tracereferences.internal.TraceReferencesResult -> com.android.tools.r8.internal.Nq1:
     java.util.Map fields -> b
     java.util.Map methods -> c
     java.util.Set keepPackageNames -> d
@@ -128396,7 +128642,7 @@ com.android.tools.r8.tracereferences.internal.TraceReferencesResult -> com.andro
     1:1:java.util.Map getTracedFields():43:43 -> b
     1:1:java.util.Map getTracedMethods():47:47 -> c
     1:1:java.util.Set getTracedPackageNames():51:51 -> d
-com.android.tools.r8.tracereferences.internal.TraceReferencesResult$Builder -> com.android.tools.r8.internal.Uq1:
+com.android.tools.r8.tracereferences.internal.TraceReferencesResult$Builder -> com.android.tools.r8.internal.Mq1:
     java.util.Map fields -> b
     java.util.Map methods -> c
     java.util.Set keepPackageNames -> d
@@ -128409,22 +128655,22 @@ com.android.tools.r8.tracereferences.internal.TraceReferencesResult$Builder -> c
     1:1:void acceptPackage(com.android.tools.r8.references.PackageReference,com.android.tools.r8.DiagnosticsHandler):83:83 -> acceptPackage
     1:1:void acceptType(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedClass,com.android.tools.r8.DiagnosticsHandler):66:66 -> acceptType
     1:1:java.util.Set lambda$acceptMethod$1(com.android.tools.r8.references.ClassReference):78:78 -> b
-com.android.tools.r8.tracereferences.internal.TracedClassImpl -> com.android.tools.r8.internal.Xq1:
+com.android.tools.r8.tracereferences.internal.TracedClassImpl -> com.android.tools.r8.internal.Pq1:
     1:3:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):22:24 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):21:21 -> <init>
     5:5:void <init>(com.android.tools.r8.references.ClassReference,com.android.tools.r8.diagnostic.DefinitionContext,com.android.tools.r8.tracereferences.TraceReferencesConsumer$ClassAccessFlags):31:31 -> <init>
     1:1:java.lang.String toString():36:36 -> toString
-com.android.tools.r8.tracereferences.internal.TracedFieldImpl -> com.android.tools.r8.internal.Yq1:
+com.android.tools.r8.tracereferences.internal.TracedFieldImpl -> com.android.tools.r8.internal.Qq1:
     1:3:void <init>(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.diagnostic.DefinitionContext):22:24 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.diagnostic.DefinitionContext):21:21 -> <init>
     5:5:void <init>(com.android.tools.r8.references.FieldReference,com.android.tools.r8.diagnostic.DefinitionContext,com.android.tools.r8.tracereferences.TraceReferencesConsumer$FieldAccessFlags):31:31 -> <init>
     1:1:java.lang.String toString():36:36 -> toString
-com.android.tools.r8.tracereferences.internal.TracedMethodImpl -> com.android.tools.r8.internal.Zq1:
+com.android.tools.r8.tracereferences.internal.TracedMethodImpl -> com.android.tools.r8.internal.Rq1:
     1:3:void <init>(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):22:24 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):21:21 -> <init>
     5:5:void <init>(com.android.tools.r8.references.MethodReference,com.android.tools.r8.diagnostic.DefinitionContext,com.android.tools.r8.tracereferences.TraceReferencesConsumer$MethodAccessFlags):31:31 -> <init>
     1:1:java.lang.String toString():36:36 -> toString
-com.android.tools.r8.tracereferences.internal.TracedReferenceBase -> com.android.tools.r8.internal.ar1:
+com.android.tools.r8.tracereferences.internal.TracedReferenceBase -> com.android.tools.r8.internal.Sq1:
     com.android.tools.r8.diagnostic.DefinitionContext referencedFrom -> b
     boolean $assertionsDisabled -> e
     java.lang.Object accessFlags -> c
@@ -129005,7 +129251,7 @@ com.android.tools.r8.utils.ArchiveResourceProvider -> com.android.tools.r8.utils
     4:4:com.android.tools.r8.utils.ArchiveResourceProvider fromArchive(java.nio.file.Path,boolean):44:44 -> fromArchive
     1:1:com.android.tools.r8.origin.Origin getOrigin():55:55 -> getOrigin
     1:3:java.util.Collection getProgramResources():105:107 -> getProgramResources
-com.android.tools.r8.utils.ArrayUtils -> com.android.tools.r8.internal.Vz0:
+com.android.tools.r8.utils.ArrayUtils -> com.android.tools.r8.internal.Yz0:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():14:14 -> <clinit>
@@ -129019,36 +129265,36 @@ com.android.tools.r8.utils.ArrayUtils -> com.android.tools.r8.internal.Vz0:
     56:57:java.lang.Object[] appendSingleElement(java.lang.Object[],java.lang.Object):170:171 -> a
     1:1:java.lang.Object last(java.lang.Object[]):95:95 -> b
     2:3:boolean contains(java.lang.Object[],java.lang.Object):139:140 -> b
-com.android.tools.r8.utils.AsmUtils -> com.android.tools.r8.internal.bA0:
+com.android.tools.r8.utils.AsmUtils -> com.android.tools.r8.internal.eA0:
     boolean isDeprecated(int) -> a
-com.android.tools.r8.utils.AssertionConfigurationWithDefault -> com.android.tools.r8.internal.dA0:
+com.android.tools.r8.utils.AssertionConfigurationWithDefault -> com.android.tools.r8.internal.gA0:
     java.util.List assertionsConfigurations -> b
     com.android.tools.r8.AssertionsConfiguration$AssertionTransformation defautlTransformation -> a
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():12:12 -> <clinit>
     1:4:void <init>(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,java.util.List):19:22 -> <init>
-com.android.tools.r8.utils.AssertionUtils -> com.android.tools.r8.internal.eA0:
+com.android.tools.r8.utils.AssertionUtils -> com.android.tools.r8.internal.hA0:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:boolean assertNotNull(java.lang.Object):12:12 -> a
     2:2:boolean forTesting(com.android.tools.r8.utils.InternalOptions,java.util.function.Supplier):17:17 -> a
-com.android.tools.r8.utils.BiForEachable -> com.android.tools.r8.internal.nB0:
-com.android.tools.r8.utils.BiMapContainer -> com.android.tools.r8.internal.pB0:
+com.android.tools.r8.utils.BiForEachable -> com.android.tools.r8.internal.qB0:
+com.android.tools.r8.utils.BiMapContainer -> com.android.tools.r8.internal.sB0:
     java.util.Map original -> a
     java.util.Map inverse -> b
     1:3:void <init>(java.util.Map,java.util.Map):21:23 -> <init>
-com.android.tools.r8.utils.BiPredicateUtils -> com.android.tools.r8.internal.qB0:
+com.android.tools.r8.utils.BiPredicateUtils -> com.android.tools.r8.internal.tB0:
     boolean lambda$alwaysFalse$0(java.lang.Object,java.lang.Object) -> a
     1:1:java.util.function.BiPredicate alwaysFalse():12:12 -> a
     2:2:java.util.function.BiPredicate or(java.util.function.BiPredicate[]):21:21 -> a
     3:4:boolean lambda$or$2(java.util.function.BiPredicate[],java.lang.Object,java.lang.Object):22:23 -> a
     boolean lambda$alwaysTrue$1(java.lang.Object,java.lang.Object) -> b
     1:1:java.util.function.BiPredicate alwaysTrue():16:16 -> b
-com.android.tools.r8.utils.BitUtils -> com.android.tools.r8.internal.KB0:
+com.android.tools.r8.utils.BitUtils -> com.android.tools.r8.internal.NB0:
     boolean isBitInMaskSet(int,int) -> a
     boolean isBitSet(int,int) -> b
-com.android.tools.r8.utils.BooleanBox -> com.android.tools.r8.internal.OB0:
+com.android.tools.r8.utils.BooleanBox -> com.android.tools.r8.internal.RB0:
     boolean value -> a
     boolean assigned -> b
     1:1:void <init>():14:14 -> <init>
@@ -129062,7 +129308,7 @@ com.android.tools.r8.utils.BooleanBox -> com.android.tools.r8.internal.OB0:
     1:1:boolean isTrue():35:35 -> c
     2:3:void set(boolean):43:44 -> c
     1:1:void set():39:39 -> d
-com.android.tools.r8.utils.BooleanLatticeElement -> com.android.tools.r8.internal.YB0:
+com.android.tools.r8.utils.BooleanLatticeElement -> com.android.tools.r8.internal.bC0:
     1:1:void <init>():27:27 -> <init>
     boolean isFalse() -> a
     1:1:boolean isPossiblyFalse():52:52 -> b
@@ -129070,13 +129316,13 @@ com.android.tools.r8.utils.BooleanLatticeElement -> com.android.tools.r8.interna
     boolean isTrue() -> d
     boolean isUnknown() -> e
     1:1:int hashCode():74:74 -> hashCode
-com.android.tools.r8.utils.BooleanUtils -> com.android.tools.r8.internal.gC0:
+com.android.tools.r8.utils.BooleanUtils -> com.android.tools.r8.internal.jC0:
     java.lang.Boolean[] VALUES -> a
     int $r8$clinit -> b
     1:1:void <clinit>():8:8 -> <clinit>
     int intValue(boolean) -> a
     1:1:java.lang.Boolean[] values():21:21 -> a
-com.android.tools.r8.utils.Box -> com.android.tools.r8.internal.vC0:
+com.android.tools.r8.utils.Box -> com.android.tools.r8.internal.yC0:
     java.lang.Object value -> a
     1:1:void <init>():15:15 -> <init>
     2:3:void <init>(java.lang.Object):17:18 -> <init>
@@ -129087,7 +129333,7 @@ com.android.tools.r8.utils.Box -> com.android.tools.r8.internal.vC0:
     1:1:boolean isSet():43:43 -> b
     1:5:boolean equals(java.lang.Object):54:58 -> equals
     1:1:int hashCode():63:63 -> hashCode
-com.android.tools.r8.utils.CfLineToMethodMapper -> com.android.tools.r8.internal.gE0:
+com.android.tools.r8.utils.CfLineToMethodMapper -> com.android.tools.r8.internal.jE0:
     java.util.Map sourceMethodMapping -> a
     com.android.tools.r8.utils.AndroidApp inputApp -> b
     boolean $assertionsDisabled -> c
@@ -129102,8 +129348,8 @@ com.android.tools.r8.utils.CfLineToMethodMapper -> com.android.tools.r8.internal
     31:35:void lambda$readLineNumbersFromClassFiles$0(com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor,com.android.tools.r8.ProgramResource):46:50 -> a
     36:36:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):424:424 -> a
     36:36:void lambda$readLineNumbersFromClassFiles$0(com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor,com.android.tools.r8.ProgramResource):51 -> a
-com.android.tools.r8.utils.CfLineToMethodMapper$1 -> com.android.tools.r8.internal.dE0:
-com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor -> com.android.tools.r8.internal.eE0:
+com.android.tools.r8.utils.CfLineToMethodMapper$1 -> com.android.tools.r8.internal.gE0:
+com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor -> com.android.tools.r8.internal.hE0:
     com.android.tools.r8.utils.CfLineToMethodMapper this$0 -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap currentLineNumberMapping -> c
     1:1:void <init>(com.android.tools.r8.utils.CfLineToMethodMapper,com.android.tools.r8.utils.CfLineToMethodMapper$1):85:85 -> <init>
@@ -129112,13 +129358,13 @@ com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor -> com.android.tool
     1:3:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):101:103 -> a
     4:4:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):109:109 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap lambda$visit$0(java.lang.String):103:103 -> d
-com.android.tools.r8.utils.CfLineToMethodMapper$MethodLineVisitor -> com.android.tools.r8.internal.fE0:
+com.android.tools.r8.utils.CfLineToMethodMapper$MethodLineVisitor -> com.android.tools.r8.internal.iE0:
     java.lang.String nameAndDescriptor -> j
     java.util.Map lineMethodMapping -> k
     1:1:void <init>(java.lang.String,java.util.Map,com.android.tools.r8.utils.CfLineToMethodMapper$1):114:114 -> <init>
     2:4:void <init>(java.lang.String,java.util.Map):120:122 -> <init>
     1:1:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):127:127 -> b
-com.android.tools.r8.utils.CfgPrinter -> com.android.tools.r8.internal.oF0:
+com.android.tools.r8.utils.CfgPrinter -> com.android.tools.r8.internal.rF0:
     java.util.Stack opened -> b
     java.lang.StringBuilder builder -> a
     int nextUnusedValue -> c
@@ -129144,14 +129390,14 @@ com.android.tools.r8.utils.CfgPrinter -> com.android.tools.r8.internal.oF0:
     7:7:com.android.tools.r8.utils.CfgPrinter sp():65:65 -> c
     1:2:com.android.tools.r8.utils.CfgPrinter print(java.lang.String):49:50 -> d
     1:1:java.lang.String toString():82:82 -> toString
-com.android.tools.r8.utils.ChainableStringConsumer -> com.android.tools.r8.internal.qF0:
+com.android.tools.r8.utils.ChainableStringConsumer -> com.android.tools.r8.internal.tF0:
     com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String) -> a
     1:1:com.android.tools.r8.utils.ChainableStringConsumer wrap(java.util.function.Consumer):15:15 -> a
-com.android.tools.r8.utils.ChainableStringConsumer$1 -> com.android.tools.r8.internal.pF0:
+com.android.tools.r8.utils.ChainableStringConsumer$1 -> com.android.tools.r8.internal.sF0:
     java.util.function.Consumer val$consumer -> a
     1:1:void <init>(java.util.function.Consumer):15:15 -> <init>
     1:1:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):18:18 -> a
-com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.internal.MG0:
+com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.internal.PG0:
     java.util.Map classes -> a
     java.util.concurrent.atomic.AtomicReference classProvider -> b
     boolean $assertionsDisabled -> c
@@ -129174,8 +129420,8 @@ com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.internal.MG0:
     com.android.tools.r8.graph.ClassKind getClassKind() -> c
     1:1:boolean isFullyLoaded():240:240 -> d
     1:1:java.lang.String toString():80:80 -> toString
-com.android.tools.r8.utils.ClassMap$1 -> com.android.tools.r8.internal.KG0:
-com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.internal.LG0:
+com.android.tools.r8.utils.ClassMap$1 -> com.android.tools.r8.internal.NG0:
+com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.internal.OG0:
     boolean ready -> e
     com.android.tools.r8.graph.DexType type -> c
     boolean $assertionsDisabled -> f
@@ -129194,7 +129440,7 @@ com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r
     66:66:void lambda$get$0(com.android.tools.r8.graph.DexClass):278 -> a
     67:67:void lambda$get$0(com.android.tools.r8.graph.DexClass):278:278 -> a
     1:1:java.lang.Object get():246:246 -> get
-com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.internal.kH0:
+com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.internal.nH0:
     com.android.tools.r8.graph.ClassKind classKind -> a
     1:2:void <init>(com.android.tools.r8.graph.ClassKind):29:30 -> <init>
     void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer) -> a
@@ -129206,8 +129452,8 @@ com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.internal.kH0:
     4:4:com.android.tools.r8.utils.ClassProvider forPreloadedClasses(com.android.tools.r8.graph.ClassKind,java.util.Collection):67 -> a
     5:8:com.android.tools.r8.utils.ClassProvider forPreloadedClasses(com.android.tools.r8.graph.ClassKind,java.util.Collection):68:71 -> a
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():35:35 -> b
-com.android.tools.r8.utils.ClassProvider$1 -> com.android.tools.r8.internal.fH0:
-com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.internal.gH0:
+com.android.tools.r8.utils.ClassProvider$1 -> com.android.tools.r8.internal.iH0:
+com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.internal.jH0:
     com.android.tools.r8.graph.JarApplicationReader reader -> d
     com.android.tools.r8.graph.ClassKind classKind -> b
     com.android.tools.r8.ClassFileResourceProvider provider -> c
@@ -129219,14 +129465,14 @@ com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.
     7:7:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):107:107 -> a
     8:10:java.util.Collection collectTypes():114:116 -> a
     1:1:java.lang.String toString():123:123 -> toString
-com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.internal.hH0:
+com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.internal.kH0:
     java.util.List providers -> b
     1:1:void <init>(com.android.tools.r8.graph.ClassKind,java.util.List,com.android.tools.r8.utils.ClassProvider$1):194:194 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.ClassKind,java.util.List):198:199 -> <init>
     1:2:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):204:205 -> a
     3:5:java.util.Collection collectTypes():211:213 -> a
     1:8:java.lang.String toString():220:227 -> toString
-com.android.tools.r8.utils.ClassProvider$FilteringClassProvider -> com.android.tools.r8.internal.iH0:
+com.android.tools.r8.utils.ClassProvider$FilteringClassProvider -> com.android.tools.r8.internal.lH0:
     java.util.Set filteredOut -> c
     com.android.tools.r8.utils.ClassProvider provider -> b
     boolean $assertionsDisabled -> d
@@ -129236,14 +129482,14 @@ com.android.tools.r8.utils.ClassProvider$FilteringClassProvider -> com.android.t
     3:6:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):175:178 -> a
     7:8:java.util.Collection collectTypes():183:184 -> a
     1:1:java.lang.String toString():190:190 -> toString
-com.android.tools.r8.utils.ClassProvider$PreloadedClassProvider -> com.android.tools.r8.internal.jH0:
+com.android.tools.r8.utils.ClassProvider$PreloadedClassProvider -> com.android.tools.r8.internal.mH0:
     com.android.tools.r8.com.google.common.collect.Multimap classes -> b
     1:1:void <init>(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.com.google.common.collect.Multimap,com.android.tools.r8.utils.ClassProvider$1):127:127 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.com.google.common.collect.Multimap):131:132 -> <init>
     1:2:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):137:138 -> a
     3:3:java.util.Collection collectTypes():144:144 -> a
     1:1:java.lang.String toString():149:149 -> toString
-com.android.tools.r8.utils.ClassReferenceUtils -> com.android.tools.r8.internal.nH0:
+com.android.tools.r8.utils.ClassReferenceUtils -> com.android.tools.r8.internal.qH0:
     int $r8$clinit -> b
     java.util.Comparator COMPARATOR -> a
     1:2:void <clinit>():16:17 -> <clinit>
@@ -129257,7 +129503,7 @@ com.android.tools.r8.utils.ClassReferenceUtils -> com.android.tools.r8.internal.
     5:5:int compare(com.android.tools.r8.references.ClassReference,com.android.tools.r8.references.MethodReference):31 -> a
     6:6:int compare(com.android.tools.r8.references.ClassReference,com.android.tools.r8.references.MethodReference):31:31 -> a
     7:7:java.util.Comparator getClassReferenceComparator():36:36 -> a
-com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.internal.MH0:
+com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.internal.PH0:
     1:1:void <init>(com.android.tools.r8.utils.ClassProvider):19:19 -> <init>
     1:1:java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass):12:12 -> a
     2:2:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):12:12 -> a
@@ -129277,34 +129523,34 @@ com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.inte
     2:2:void com.android.tools.r8.utils.ClasspathClassCollection.<init>():15:15 -> e
     2:2:com.android.tools.r8.utils.ClasspathClassCollection empty():23 -> e
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.utils.CollectionUtils -> com.android.tools.r8.internal.vI0:
+com.android.tools.r8.utils.CollectionUtils -> com.android.tools.r8.internal.yI0:
     1:4:java.util.Set mergeSets(java.util.Collection,java.util.Collection):15:18 -> a
-com.android.tools.r8.utils.ComparatorUtils -> com.android.tools.r8.internal.GI0:
+com.android.tools.r8.utils.ComparatorUtils -> com.android.tools.r8.internal.JI0:
     1:3:int lambda$listComparator$0(java.util.Comparator,java.util.List,java.util.List):18:20 -> a
     4:4:java.util.Comparator arrayComparator(java.util.Comparator):57:57 -> a
     5:7:int lambda$arrayComparator$1(java.util.Comparator,java.lang.Object[],java.lang.Object[]):58:60 -> a
     8:8:java.util.Comparator unreachableComparator():67:67 -> a
     9:9:int lambda$unreachableComparator$2(java.lang.Object,java.lang.Object):68:68 -> a
     1:1:java.util.Comparator listComparator(java.util.Comparator):17:17 -> b
-com.android.tools.r8.utils.CompareResult$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.HI0:
+com.android.tools.r8.utils.CompareResult$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.KI0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     boolean com.android.tools.r8.utils.CompareResult.isEqual() -> a
     1:1:com.android.tools.r8.utils.CompareResult com.android.tools.r8.utils.CompareResult.compare(java.lang.Object,java.lang.Object,java.util.Comparator):33:33 -> a
     int getComparisonResult(int) -> b
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.utils.ConsumerUtils -> com.android.tools.r8.internal.KJ0:
+com.android.tools.r8.utils.ConsumerUtils -> com.android.tools.r8.internal.NJ0:
     void lambda$emptyBiConsumer$4(java.lang.Object,java.lang.Object) -> a
     void lambda$emptyConsumer$3(java.lang.Object) -> a
-    1:1:java.util.function.Consumer acceptIfNotSeen(java.util.function.Consumer,java.util.Set):23:23 -> a
-    2:3:void lambda$acceptIfNotSeen$2(java.util.Set,java.util.function.Consumer,java.lang.Object):24:25 -> a
-    4:4:java.util.function.BiConsumer emptyBiConsumer():35:35 -> a
+    1:1:java.util.function.Consumer acceptIfNotSeen(java.util.function.Consumer,java.util.Set):29:29 -> a
+    2:3:void lambda$acceptIfNotSeen$2(java.util.Set,java.util.function.Consumer,java.lang.Object):30:31 -> a
+    4:4:java.util.function.BiConsumer emptyBiConsumer():41:41 -> a
     void lambda$emptyThrowingConsumer$5(java.lang.Object) -> b
-    1:1:java.util.function.Consumer emptyConsumer():31:31 -> b
-    1:1:com.android.tools.r8.utils.ThrowingConsumer emptyThrowingConsumer():39:39 -> c
-com.android.tools.r8.utils.DequeUtils -> com.android.tools.r8.internal.HK0:
+    1:1:java.util.function.Consumer emptyConsumer():37:37 -> b
+    1:1:com.android.tools.r8.utils.ThrowingConsumer emptyThrowingConsumer():45:45 -> c
+com.android.tools.r8.utils.DequeUtils -> com.android.tools.r8.internal.KK0:
     1:2:java.util.Deque newArrayDeque(java.lang.Object):13:14 -> a
-com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.internal.JK0:
+com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.internal.MK0:
     java.util.Map typeNameToLetterMap -> a
     boolean $assertionsDisabled -> b
     int $r8$clinit -> c
@@ -129385,15 +129631,15 @@ com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.internal.JK0:
     6:10:boolean isDescriptor(java.lang.String):245 -> x
     1:6:boolean isValidJavaType(java.lang.String):123:128 -> y
     1:2:java.lang.String javaTypeToDescriptor(java.lang.String):67:68 -> z
-com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.internal.IK0:
+com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.internal.LK0:
     java.lang.String module -> a
     java.lang.String descriptor -> b
     1:3:void <init>(java.lang.String,java.lang.String):590:592 -> <init>
     1:1:java.lang.String getDescriptor():600:600 -> a
     1:1:java.lang.String getModule():596:596 -> b
-com.android.tools.r8.utils.DexUtils -> com.android.tools.r8.internal.wM0:
+com.android.tools.r8.utils.DexUtils -> com.android.tools.r8.internal.zM0:
     1:2:java.lang.String getDefaultDexFileName(int):10:11 -> a
-com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.internal.yM0:
+com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.internal.BM0:
     byte[] dexVersionBytes -> b
     com.android.tools.r8.utils.DexVersion[] $VALUES -> g
     com.android.tools.r8.utils.DexVersion V35 -> c
@@ -129420,10 +129666,10 @@ com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.internal.yM0:
     3:3:java.util.Optional getDexVersion(int):91:91 -> d
     4:4:java.util.Optional getDexVersion(int):89:89 -> d
     5:5:java.util.Optional getDexVersion(int):87:87 -> d
-com.android.tools.r8.utils.DexVersion$1 -> com.android.tools.r8.internal.xM0:
+com.android.tools.r8.utils.DexVersion$1 -> com.android.tools.r8.internal.AM0:
     int[] $SwitchMap$com$android$tools$r8$utils$AndroidApiLevel -> a
     1:1:void <clinit>():40:40 -> <clinit>
-com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.internal.BM0:
+com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.internal.EM0:
     com.android.tools.r8.origin.Origin origin -> b
     java.nio.file.Path root -> a
     1:3:void <init>(java.nio.file.Path):24:26 -> <init>
@@ -129437,7 +129683,7 @@ com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.internal.BM0
     24:24:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):73:73 -> a
     25:25:java.nio.file.Path getPath():83:83 -> a
     1:1:com.android.tools.r8.origin.Origin getOrigin():78:78 -> getOrigin
-com.android.tools.r8.utils.DisjointSets -> com.android.tools.r8.internal.DM0:
+com.android.tools.r8.utils.DisjointSets -> com.android.tools.r8.internal.GM0:
     java.util.Map parent -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -129453,28 +129699,28 @@ com.android.tools.r8.utils.DisjointSets -> com.android.tools.r8.internal.DM0:
     1:1:java.util.Set lambda$collectSets$0(java.lang.Object):143:143 -> e
     1:3:java.lang.Object makeSet(java.lang.Object):27:29 -> f
     1:12:java.lang.String toString():150:161 -> toString
-com.android.tools.r8.utils.DumpInputFlags -> com.android.tools.r8.internal.PM0:
+com.android.tools.r8.utils.DumpInputFlags -> com.android.tools.r8.internal.SM0:
     1:1:void <init>():8:8 -> <init>
     java.nio.file.Path getDumpInputToDirectory() -> a
     1:1:com.android.tools.r8.utils.DumpInputFlags dumpToDirectory(java.nio.file.Path):39:39 -> a
     java.nio.file.Path getDumpInputToFile() -> b
     1:1:com.android.tools.r8.utils.DumpInputFlags dumpToFile(java.nio.file.Path):25:25 -> b
     1:1:com.android.tools.r8.utils.DumpInputFlags noDump():11:11 -> c
-com.android.tools.r8.utils.DumpInputFlags$1 -> com.android.tools.r8.internal.MM0:
+com.android.tools.r8.utils.DumpInputFlags$1 -> com.android.tools.r8.internal.PM0:
     1:1:void <init>():11:11 -> <init>
     java.nio.file.Path getDumpInputToDirectory() -> a
     java.nio.file.Path getDumpInputToFile() -> b
-com.android.tools.r8.utils.DumpInputFlags$2 -> com.android.tools.r8.internal.NM0:
+com.android.tools.r8.utils.DumpInputFlags$2 -> com.android.tools.r8.internal.QM0:
     java.nio.file.Path val$file -> a
     1:1:void <init>(java.nio.file.Path):25:25 -> <init>
     java.nio.file.Path getDumpInputToDirectory() -> a
     1:1:java.nio.file.Path getDumpInputToFile():28:28 -> b
-com.android.tools.r8.utils.DumpInputFlags$3 -> com.android.tools.r8.internal.OM0:
+com.android.tools.r8.utils.DumpInputFlags$3 -> com.android.tools.r8.internal.RM0:
     java.nio.file.Path val$file -> a
     1:1:void <init>(java.nio.file.Path):39:39 -> <init>
     1:1:java.nio.file.Path getDumpInputToDirectory():47:47 -> a
     java.nio.file.Path getDumpInputToFile() -> b
-com.android.tools.r8.utils.EncodedValueUtils -> com.android.tools.r8.internal.mN0:
+com.android.tools.r8.utils.EncodedValueUtils -> com.android.tools.r8.internal.pN0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:6:int putBitsFromRightZeroExtended(com.android.tools.r8.dex.DexOutputBuffer,long,int):84:89 -> a
@@ -129503,7 +129749,7 @@ com.android.tools.r8.utils.ExceptionDiagnostic -> com.android.tools.r8.utils.Exc
     1:1:java.lang.String getDiagnosticMessage():65:65 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():51:51 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():56:56 -> getPosition
-com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.internal.oO0:
+com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.internal.rO0:
     1:1:com.android.tools.r8.origin.Origin access$000(java.lang.Throwable):28:28 -> a
     2:7:java.lang.String getMainStackTrace():31:36 -> a
     8:8:boolean lambda$getMainStackTrace$0(java.util.Map$Entry):32:32 -> a
@@ -129549,9 +129795,9 @@ com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.internal.oO0:
     2:2:void printExitMessage(java.lang.Throwable):198 -> e
     3:4:void printExitMessage(java.lang.Throwable):199:200 -> e
     5:5:void printExitMessage(java.lang.Throwable):197:197 -> e
-com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.internal.oO0$a:
-com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.internal.pO0:
-com.android.tools.r8.utils.ExceptionUtils$OriginAttachmentException -> com.android.tools.r8.internal.qO0:
+com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.internal.rO0$a:
+com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.internal.sO0:
+com.android.tools.r8.utils.ExceptionUtils$OriginAttachmentException -> com.android.tools.r8.internal.tO0:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.Position position -> b
     1:3:void <init>(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):263:265 -> <init>
@@ -129617,7 +129863,7 @@ com.android.tools.r8.utils.FeatureClassMapping$JarFileOrigin -> com.android.tool
 com.android.tools.r8.utils.FeatureClassMapping$SpecificationOrigin -> com.android.tools.r8.utils.x:
     1:1:void <init>(java.nio.file.Path):72:72 -> <init>
     1:1:java.lang.String part():77:77 -> part
-com.android.tools.r8.utils.FieldReferenceUtils -> com.android.tools.r8.internal.bP0:
+com.android.tools.r8.utils.FieldReferenceUtils -> com.android.tools.r8.internal.eP0:
     int $r8$clinit -> b
     java.util.Comparator COMPARATOR -> a
     1:1:void <clinit>():18:18 -> <clinit>
@@ -129638,7 +129884,7 @@ com.android.tools.r8.utils.FieldReferenceUtils -> com.android.tools.r8.internal.
     9:9:int com.android.tools.r8.utils.CompareResult.getComparisonResult():21:21 -> b
     9:9:int lambda$static$0(com.android.tools.r8.references.FieldReference,com.android.tools.r8.references.FieldReference):29 -> b
     10:10:int lambda$static$0(com.android.tools.r8.references.FieldReference,com.android.tools.r8.references.FieldReference):31:31 -> b
-com.android.tools.r8.utils.FieldSignatureEquivalence -> com.android.tools.r8.internal.fP0:
+com.android.tools.r8.utils.FieldSignatureEquivalence -> com.android.tools.r8.internal.iP0:
     com.android.tools.r8.utils.FieldSignatureEquivalence INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(boolean):23:23 -> <init>
@@ -129649,7 +129895,7 @@ com.android.tools.r8.utils.FieldSignatureEquivalence -> com.android.tools.r8.int
     4:4:int com.android.tools.r8.utils.FieldSignatureEquivalence.doHash(com.android.tools.r8.graph.DexField):48:48 -> a
     4:4:int doHash(java.lang.Object):14 -> a
     5:5:com.android.tools.r8.utils.FieldSignatureEquivalence get():28:28 -> a
-com.android.tools.r8.utils.FileUtils -> com.android.tools.r8.internal.lP0:
+com.android.tools.r8.utils.FileUtils -> com.android.tools.r8.internal.oP0:
     boolean isAndroid -> a
     boolean $assertionsDisabled -> b
     1:16:void <clinit>():21:36 -> <clinit>
@@ -129673,21 +129919,21 @@ com.android.tools.r8.utils.FileUtils -> com.android.tools.r8.internal.lP0:
     1:1:java.util.List readAllLines(java.nio.file.Path):90:90 -> g
 com.android.tools.r8.utils.FilteredArchiveClassFileProvider -> com.android.tools.r8.utils.y:
     1:1:void <init>(com.android.tools.r8.shaking.FilteredClassPath):13:13 -> <init>
-com.android.tools.r8.utils.FlagFile -> com.android.tools.r8.internal.xP0:
+com.android.tools.r8.utils.FlagFile -> com.android.tools.r8.internal.AP0:
     1:15:java.lang.String[] expandFlagFiles(java.lang.String[],java.util.function.Consumer):34:48 -> a
-com.android.tools.r8.utils.FlagFile$FlagFileOrigin -> com.android.tools.r8.internal.wP0:
+com.android.tools.r8.utils.FlagFile$FlagFileOrigin -> com.android.tools.r8.internal.zP0:
     java.nio.file.Path path -> e
     1:2:void <init>(java.nio.file.Path):23:24 -> <init>
     1:1:java.lang.String part():29:29 -> part
-com.android.tools.r8.utils.ForEachable -> com.android.tools.r8.internal.KP0:
-com.android.tools.r8.utils.ForEachableUtils -> com.android.tools.r8.internal.LP0:
+com.android.tools.r8.utils.ForEachable -> com.android.tools.r8.internal.NP0:
+com.android.tools.r8.utils.ForEachableUtils -> com.android.tools.r8.internal.OP0:
     void lambda$empty$0(java.util.function.Consumer) -> a
     1:1:com.android.tools.r8.utils.ForEachable empty():10:10 -> a
-com.android.tools.r8.utils.FunctionUtils -> com.android.tools.r8.internal.xQ0:
+com.android.tools.r8.utils.FunctionUtils -> com.android.tools.r8.internal.AQ0:
     1:2:void forEachApply(java.lang.Iterable,java.util.function.Function,java.lang.Object):28:29 -> a
     3:3:java.util.function.Function ignoreArgument(java.util.function.Supplier):34:34 -> a
     4:4:java.lang.Object lambda$ignoreArgument$2(java.util.function.Supplier,java.lang.Object):34:34 -> a
-com.android.tools.r8.utils.HeapUtils -> com.android.tools.r8.internal.AR0:
+com.android.tools.r8.utils.HeapUtils -> com.android.tools.r8.internal.DR0:
     com.sun.management.HotSpotDiagnosticMXBean hotSpotDiagnosticMXBean -> a
     1:3:void com.android.tools.r8.utils.HeapUtils.initHotSpotMBean():19:21 -> a
     1:3:void dumpHeap(java.nio.file.Path,boolean):35 -> a
@@ -129697,29 +129943,29 @@ com.android.tools.r8.utils.HeapUtils -> com.android.tools.r8.internal.AR0:
     6:8:void com.android.tools.r8.utils.HeapUtils.initHotSpotMBean():22:24 -> a
     6:8:void dumpHeap(java.nio.file.Path,boolean):35 -> a
     9:9:void dumpHeap(java.nio.file.Path,boolean):36:36 -> a
-com.android.tools.r8.utils.IROrdering -> com.android.tools.r8.internal.bS0:
+com.android.tools.r8.utils.IROrdering -> com.android.tools.r8.internal.eS0:
     java.lang.Iterable order(java.lang.Iterable) -> a
-com.android.tools.r8.utils.IROrdering$IdentityIROrdering -> com.android.tools.r8.internal.ZR0:
+com.android.tools.r8.utils.IROrdering$IdentityIROrdering -> com.android.tools.r8.internal.cS0:
     com.android.tools.r8.utils.IROrdering$IdentityIROrdering INSTANCE -> a
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>():27:27 -> <init>
     java.lang.Iterable order(java.lang.Iterable) -> a
     1:1:com.android.tools.r8.utils.IROrdering$IdentityIROrdering getInstance():30:30 -> a
-com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering -> com.android.tools.r8.internal.aS0:
+com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering -> com.android.tools.r8.internal.dS0:
     com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering INSTANCE -> a
     1:1:void <clinit>():51:51 -> <clinit>
     1:1:void <init>():53:53 -> <init>
     1:1:com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering getInstance():56:56 -> a
     2:3:java.util.List com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering.order(java.lang.Iterable):61:62 -> a
     2:3:java.lang.Iterable order(java.lang.Iterable):49 -> a
-com.android.tools.r8.utils.IdentifierUtils -> com.android.tools.r8.internal.jS0:
+com.android.tools.r8.utils.IdentifierUtils -> com.android.tools.r8.internal.mS0:
     1:1:boolean isDexIdentifierPart(int):14:14 -> a
     1:1:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierPart(int):14:14 -> b
     1:1:boolean isDexIdentifierStart(int):10 -> b
     1:2:boolean isRelaxedDexIdentifierPart(int):18:19 -> c
     boolean isSimpleNameChar(int) -> d
     boolean isUnicodeSpace(int) -> e
-com.android.tools.r8.utils.IntBox -> com.android.tools.r8.internal.tW0:
+com.android.tools.r8.utils.IntBox -> com.android.tools.r8.internal.wW0:
     boolean $assertionsDisabled -> b
     int value -> a
     1:1:void <clinit>():7:7 -> <clinit>
@@ -129734,11 +129980,11 @@ com.android.tools.r8.utils.IntBox -> com.android.tools.r8.internal.tW0:
     2:3:void increment(int):52:53 -> c
     1:1:void set(int):57:57 -> d
     1:2:void setMax(int):61:62 -> e
-com.android.tools.r8.utils.IntObjConsumer -> com.android.tools.r8.internal.IW0:
+com.android.tools.r8.utils.IntObjConsumer -> com.android.tools.r8.internal.LW0:
     void accept(int,java.lang.Object) -> a
-com.android.tools.r8.utils.IntObjPredicate -> com.android.tools.r8.internal.JW0:
+com.android.tools.r8.utils.IntObjPredicate -> com.android.tools.r8.internal.MW0:
     boolean test(int,java.lang.Object) -> a
-com.android.tools.r8.utils.IntObjToObjFunction -> com.android.tools.r8.internal.KW0:
+com.android.tools.r8.utils.IntObjToObjFunction -> com.android.tools.r8.internal.NW0:
     java.lang.Object apply(int,java.lang.Object) -> a
 com.android.tools.r8.utils.InternalArchiveClassFileProvider -> com.android.tools.r8.utils.z:
     java.util.Set descriptors -> c
@@ -129763,7 +130009,7 @@ com.android.tools.r8.utils.InternalArchiveClassFileProvider -> com.android.tools
     25:25:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> getProgramResource
     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.internal.xX0:
+com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.internal.AX0:
     boolean enableValuePropagation -> f0
     boolean forceAnnotateSynthetics -> P
     boolean printMemory -> i
@@ -129896,165 +130142,167 @@ com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.internal.xX0:
     boolean enableRedundantConstNumberOptimization -> i0
     1:32:void <clinit>():100:131 -> <clinit>
     1:1:void <init>():161:161 -> <init>
-    2:877:void <init>():153:1028 -> <init>
-    878:882:void <init>():162:166 -> <init>
-    883:883:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):170:170 -> <init>
-    884:1759:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):153:1028 -> <init>
-    1760:1767:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):171:178 -> <init>
-    1768:1768:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):182:182 -> <init>
-    1769:2644:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):153:1028 -> <init>
-    2645:2659:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):183:197 -> <init>
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():425:425 -> A
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():464:464 -> A
-    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():426 -> A
-    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():427:427 -> A
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():468:468 -> A
-    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():428 -> A
-    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():429:429 -> A
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> A
-    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():430 -> A
-    7:9:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():431:433 -> A
+    2:164:void <init>():153:315 -> <init>
+    165:885:void <init>():314:1034 -> <init>
+    886:890:void <init>():162:166 -> <init>
+    891:891:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):170:170 -> <init>
+    892:1054:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):153:315 -> <init>
+    1055:1775:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):314:1034 -> <init>
+    1776:1783:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):171:178 -> <init>
+    1784:1784:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):182:182 -> <init>
+    1785:1947:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):153:315 -> <init>
+    1948:2668:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):314:1034 -> <init>
+    2669:2683:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):183:197 -> <init>
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():431:431 -> A
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():470:470 -> A
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():432 -> A
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():433:433 -> A
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():474:474 -> A
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():434 -> A
+    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():435:435 -> A
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> A
+    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():436 -> A
+    7:9:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():437:439 -> A
     1:3:com.android.tools.r8.naming.MapVersion getMapFileVersion():1643:1645 -> B
     1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():146:146 -> C
-    1:1:boolean hasConsumer():421:421 -> D
-    1:1:boolean hasMethodsFilter():1123:1123 -> E
+    1:1:boolean hasConsumer():427:427 -> D
+    1:1:boolean hasMethodsFilter():1129:1129 -> E
     1:1:boolean hasProguardConfiguration():142:142 -> F
-    1:1:boolean hasUsageInformationConsumer():829:829 -> G
-    1:1:com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions():731:731 -> H
-    1:1:boolean isDesugaredLibraryCompilation():437:437 -> I
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> J
-    1:1:boolean isDesugaring():476 -> J
-    2:2:boolean isDesugaring():476:476 -> J
-    1:1:boolean isGeneratingClassFiles():472:472 -> K
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():464:464 -> L
-    1:1:boolean isGeneratingDex():460 -> L
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():468:468 -> L
-    2:2:boolean isGeneratingDex():460 -> L
+    1:1:boolean hasUsageInformationConsumer():835:835 -> G
+    1:1:com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions():737:737 -> H
+    1:1:boolean isDesugaredLibraryCompilation():443:443 -> I
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> J
+    1:1:boolean isDesugaring():482 -> J
+    2:2:boolean isDesugaring():482:482 -> J
+    1:1:boolean isGeneratingClassFiles():478:478 -> K
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():470:470 -> L
+    1:1:boolean isGeneratingDex():466 -> L
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():474:474 -> L
+    2:2:boolean isGeneratingDex():466 -> L
     1:6:boolean isInterfaceMethodDesugaringEnabled():1762:1767 -> M
-    1:1:boolean isKeepAttributesSignatureEnabled():619:619 -> N
-    1:1:boolean isKeepEnclosingMethodAttributeEnabled():624:624 -> O
-    1:1:boolean isKeepInnerClassesAttributeEnabled():629:629 -> P
-    1:1:boolean isKeepRuntimeInvisibleAnnotationsEnabled():634:634 -> Q
-    1:1:boolean isKeepRuntimeInvisibleParameterAnnotationsEnabled():639:639 -> R
-    1:1:boolean isKeepRuntimeVisibleAnnotationsEnabled():644:644 -> S
-    1:1:boolean isKeepRuntimeVisibleParameterAnnotationsEnabled():649:649 -> T
-    1:3:boolean isMinifying():578:578 -> U
-    5:5:boolean isMinifying():580:580 -> U
-    1:1:boolean isOptimizing():564:564 -> V
-    1:1:boolean isRelease():568:568 -> W
-    1:1:boolean isRepackagingEnabled():605:605 -> X
-    1:3:boolean isShrinking():572:572 -> Y
-    5:5:boolean isShrinking():574:574 -> Y
+    1:1:boolean isKeepAttributesSignatureEnabled():625:625 -> N
+    1:1:boolean isKeepEnclosingMethodAttributeEnabled():630:630 -> O
+    1:1:boolean isKeepInnerClassesAttributeEnabled():635:635 -> P
+    1:1:boolean isKeepRuntimeInvisibleAnnotationsEnabled():640:640 -> Q
+    1:1:boolean isKeepRuntimeInvisibleParameterAnnotationsEnabled():645:645 -> R
+    1:1:boolean isKeepRuntimeVisibleAnnotationsEnabled():650:650 -> S
+    1:1:boolean isKeepRuntimeVisibleParameterAnnotationsEnabled():655:655 -> T
+    1:3:boolean isMinifying():584:584 -> U
+    5:5:boolean isMinifying():586:586 -> U
+    1:1:boolean isOptimizing():570:570 -> V
+    1:1:boolean isRelease():574:574 -> W
+    1:1:boolean isRepackagingEnabled():611:611 -> X
+    1:3:boolean isShrinking():578:578 -> Y
+    5:5:boolean isShrinking():580:580 -> Y
     1:1:boolean isStringSwitchConversionEnabled():1775:1775 -> Z
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:1:com.android.tools.r8.utils.Box access$100(com.android.tools.r8.utils.InternalOptions):100:100 -> a
-    2:3:void setMarker(com.android.tools.r8.dex.Marker):365:366 -> a
-    4:5:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):370:371 -> a
-    6:12:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):378:384 -> a
-    6:12:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):373 -> a
-    13:13:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
-    13:13:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):385 -> a
-    13:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):373 -> a
-    14:29:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):385:400 -> a
-    14:29:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):373 -> a
-    30:39:void setDumpInputFlags(com.android.tools.r8.utils.DumpInputFlags,boolean):407:416 -> a
-    40:49:boolean isClassMergingExtensionRequired(com.android.tools.r8.shaking.Enqueuer$Mode):657:666 -> a
-    50:50:com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelingOptions():743:743 -> a
-    51:53:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):902:904 -> a
+    1:1:com.android.tools.r8.utils.Box access$000(com.android.tools.r8.utils.InternalOptions):100:100 -> a
+    2:3:void setMarker(com.android.tools.r8.dex.Marker):371:372 -> a
+    4:5:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):376:377 -> a
+    6:12:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):384:390 -> a
+    6:12:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):379 -> a
+    13:13:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
+    13:13:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):391 -> a
+    13:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):379 -> a
+    14:29:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):391:406 -> a
+    14:29:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):379 -> a
+    30:39:void setDumpInputFlags(com.android.tools.r8.utils.DumpInputFlags,boolean):413:422 -> a
+    40:49:boolean isClassMergingExtensionRequired(com.android.tools.r8.shaking.Enqueuer$Mode):663:672 -> a
+    50:50:com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelingOptions():749:749 -> a
+    51:53:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):908:910 -> a
     54:54:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():760:760 -> a
-    54:54:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):904 -> a
-    55:55:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):904:904 -> a
-    56:56:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):902:902 -> a
-    57:63:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):946:952 -> a
-    64:64:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):947:947 -> a
-    65:66:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):959:960 -> a
+    54:54:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):910 -> a
+    55:55:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):910:910 -> a
+    56:56:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):908:908 -> a
+    57:63:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):952:958 -> a
+    64:64:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):953:953 -> a
+    65:66:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):965:966 -> a
     67:67:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():760:760 -> a
-    67:67:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):962 -> a
-    68:74:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):962:968 -> a
-    75:75:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):960:960 -> a
-    76:84:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):988:996 -> a
-    85:85:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):995:995 -> a
-    86:86:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):989:989 -> a
-    87:87:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$1(com.android.tools.r8.graph.DexClassAndMethod):997:997 -> a
-    88:91:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.cf.CfVersion):1002:1005 -> a
-    92:96:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):1010:1014 -> a
-    97:103:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1019:1025 -> a
-    104:104:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1020:1020 -> a
-    105:105:java.util.List lambda$warningInvalidDebugInfo$4(com.android.tools.r8.origin.Origin):1024:1024 -> a
-    106:111:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1128:1133 -> a
+    67:67:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):968 -> a
+    68:74:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):968:974 -> a
+    75:75:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):966:966 -> a
+    76:84:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):994:1002 -> a
+    85:85:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):1001:1001 -> a
+    86:86:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):995:995 -> a
+    87:87:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$1(com.android.tools.r8.graph.DexClassAndMethod):1003:1003 -> a
+    88:91:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.cf.CfVersion):1008:1011 -> a
+    92:96:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):1016:1020 -> a
+    97:103:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1025:1031 -> a
+    104:104:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1026:1026 -> a
+    105:105:java.util.List lambda$warningInvalidDebugInfo$4(com.android.tools.r8.origin.Origin):1030:1030 -> a
+    106:111:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1134:1139 -> a
     112:112:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1685:1685 -> a
-    113:113:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    113:113:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     113:113:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1685 -> a
     114:115:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1685:1686 -> a
-    1:2:boolean keepInnerClassStructure():677:678 -> a0
-    1:1:boolean assertionsEnabled():869:869 -> b
-    2:35:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):908:941 -> b
-    36:36:java.util.List lambda$warningInvalidParameterAnnotations$3(com.android.tools.r8.origin.Origin):1013:1013 -> b
-    37:38:void enableConstantArgumentPropagationForTesting(com.android.tools.r8.utils.InternalOptions):1266:1267 -> b
-    39:44:com.android.tools.r8.cf.CfVersion classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1804:1809 -> b
-    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():739:739 -> b0
-    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():727:727 -> c
-    2:2:java.util.List lambda$warningMissingEnclosingMember$2(com.android.tools.r8.origin.Origin):1004:1004 -> c
-    1:1:boolean parseSignatureAttribute():614:614 -> c0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isKeepAttributesSignatureEnabled():619:619 -> c0
-    2:2:boolean parseSignatureAttribute():614 -> c0
-    1:10:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):1031:1040 -> d
-    11:17:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):1036:1042 -> d
+    1:2:boolean keepInnerClassStructure():683:684 -> a0
+    1:1:boolean assertionsEnabled():875:875 -> b
+    2:35:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):914:947 -> b
+    36:36:java.util.List lambda$warningInvalidParameterAnnotations$3(com.android.tools.r8.origin.Origin):1019:1019 -> b
+    37:42:com.android.tools.r8.cf.CfVersion classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1804:1809 -> b
+    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():745:745 -> b0
+    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():733:733 -> c
+    2:2:java.util.List lambda$warningMissingEnclosingMember$2(com.android.tools.r8.origin.Origin):1010:1010 -> c
+    1:1:boolean parseSignatureAttribute():620:620 -> c0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isKeepAttributesSignatureEnabled():625:625 -> c0
+    2:2:boolean parseSignatureAttribute():620 -> c0
+    1:10:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):1037:1046 -> d
+    11:17:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):1042:1048 -> d
     18:18:boolean canHaveArtCheckCastVerifierBug():2117:2117 -> d
-    1:32:boolean printWarnings():1048:1079 -> d0
-    33:72:boolean printWarnings():1075:1114 -> d0
+    1:32:boolean printWarnings():1054:1085 -> d0
+    33:72:boolean printWarnings():1081:1120 -> d0
     1:2:boolean canHaveArtInstanceOfVerifierBug():2072:2073 -> e
-    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():735:735 -> e0
+    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():741:741 -> e0
     1:1:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2149:2149 -> f
     1:1:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1690:1690 -> f0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> f0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> f0
     2:2:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1690 -> f0
     3:4:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1690:1691 -> f0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> g
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> g
     1:1:boolean canHaveDalvikCatchHandlerVerificationBug():2141 -> g
     2:2:boolean canHaveDalvikCatchHandlerVerificationBug():2141:2141 -> g
-    1:1:boolean shouldBackportMethods():445:445 -> g0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> h
+    1:1:boolean shouldBackportMethods():451:451 -> g0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> h
     1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2163 -> h
     2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2163:2163 -> h
-    1:1:boolean shouldDesugarRecords():518:518 -> h0
+    1:1:boolean shouldDesugarRecords():524:524 -> h0
     2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseRecords():1723:1723 -> h0
-    2:2:boolean shouldDesugarRecords():518 -> h0
+    2:2:boolean shouldDesugarRecords():524 -> h0
     1:1:boolean canLeaveStaticInterfaceMethodInvokes():1727:1727 -> i
     2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1656:1656 -> i
     2:2:boolean canLeaveStaticInterfaceMethodInvokes():1727 -> i
-    1:1:boolean shouldKeepStackMapTable():449:449 -> i0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():441:441 -> i0
-    2:2:boolean shouldKeepStackMapTable():449 -> i0
-    3:4:boolean shouldKeepStackMapTable():449:450 -> i0
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():441:441 -> i0
-    5:5:boolean shouldKeepStackMapTable():451 -> i0
-    6:6:boolean shouldKeepStackMapTable():452:452 -> i0
+    1:1:boolean shouldKeepStackMapTable():455:455 -> i0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():447:447 -> i0
+    2:2:boolean shouldKeepStackMapTable():455 -> i0
+    3:4:boolean shouldKeepStackMapTable():455:456 -> i0
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():447:447 -> i0
+    5:5:boolean shouldKeepStackMapTable():457 -> i0
+    6:6:boolean shouldKeepStackMapTable():458:458 -> i0
     1:1:boolean canUseDefaultAndStaticInterfaceMethods():1715:1715 -> j
     2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1656:1656 -> j
     2:2:boolean canUseDefaultAndStaticInterfaceMethods():1715 -> j
-    1:1:boolean shouldRerunEnqueuer():456:456 -> j0
+    1:1:boolean shouldRerunEnqueuer():462:462 -> j0
     1:2:boolean canUseFilledNewArrayOfObjects():1831:1832 -> k
     3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1656:1656 -> k
     3:3:boolean canUseFilledNewArrayOfObjects():1832 -> k
-    1:18:void signalFinishedToConsumers():492:509 -> k0
-    1:1:boolean canUseInputStackMaps():682:682 -> l
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> l
-    2:2:boolean canUseInputStackMaps():682 -> l
-    1:2:void warningReadingKotlinMetadataReflective():973:974 -> l0
+    1:18:void signalFinishedToConsumers():498:515 -> k0
+    1:1:boolean canUseInputStackMaps():688:688 -> l
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> l
+    2:2:boolean canUseInputStackMaps():688 -> l
+    1:2:void warningReadingKotlinMetadataReflective():979:980 -> l0
     1:1:boolean canUseJavaUtilObjectsRequireNonNull():1792:1792 -> m
     2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1656:1656 -> m
     2:2:boolean canUseJavaUtilObjectsRequireNonNull():1792 -> m
     1:2:boolean canUseMultidex():1779:1780 -> n
     3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1656:1656 -> n
     3:3:boolean canUseMultidex():1780 -> n
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> o
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> o
     1:1:boolean canUseNotInstruction():1867 -> o
     2:2:boolean canUseNotInstruction():1867:1867 -> o
     3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1656:1656 -> o
     3:3:boolean canUseNotInstruction():1867 -> o
     1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1840:1841 -> p
-    1:1:com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions():747:747 -> q
+    1:1:com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions():753:753 -> q
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():138:138 -> r
     1:3:void disableAllOptimizations():211:213 -> s
     1:16:void disableGlobalOptimizations():217:232 -> t
@@ -130068,12 +130316,12 @@ com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.internal.xX0:
     7:7:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1731 -> x
     7:7:boolean enableTryWithResourcesDesugaring():1747 -> x
     8:8:boolean enableTryWithResourcesDesugaring():1749:1749 -> x
-    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():768:776 -> y
-    1:9:java.util.Set getExtensiveLoggingFilter():755:763 -> z
-com.android.tools.r8.utils.InternalOptions$1 -> com.android.tools.r8.internal.vX0:
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():774:782 -> y
+    1:9:java.util.Set getExtensiveLoggingFilter():761:769 -> z
+com.android.tools.r8.utils.InternalOptions$1 -> com.android.tools.r8.internal.yX0:
     int[] $SwitchMap$com$android$tools$r8$utils$OffOrAuto -> a
     1:1:void <clinit>():1743:1743 -> <clinit>
-com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions -> com.android.tools.r8.internal.xX0$a:
+com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions -> com.android.tools.r8.internal.AX0$a:
     java.util.Map methodApiMapping -> a
     java.util.Map fieldApiMapping -> b
     java.util.Map classApiMapping -> c
@@ -130085,7 +130333,7 @@ com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions -> com.android
     12:12:void lambda$visitMockedApiReferences$0(java.util.Set,com.android.tools.r8.references.MethodReference):1369:1369 -> a
     13:13:void lambda$visitMockedApiReferences$1(java.util.Set,com.android.tools.r8.references.FieldReference):1372:1372 -> a
     14:14:void lambda$visitMockedApiReferences$2(java.util.function.BiConsumer,com.android.tools.r8.references.ClassReference):1375:1375 -> a
-com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions$1 -> com.android.tools.r8.internal.wX0:
+com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions$1 -> com.android.tools.r8.internal.zX0:
     com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions this$0 -> c
     com.android.tools.r8.references.ClassReference val$classReference -> b
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions,com.android.tools.r8.references.ClassReference,com.android.tools.r8.references.ClassReference):1377:1377 -> <init>
@@ -130101,36 +130349,37 @@ com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions$1 -> com.andro
     3:3:java.lang.Object com.android.tools.r8.utils.EntryUtils.accept(java.util.Map$Entry,java.util.function.BiFunction):13:13 -> b
     3:3:com.android.tools.r8.utils.TraversalContinuation visitMethods(java.util.function.BiFunction):1411 -> b
     4:8:com.android.tools.r8.utils.TraversalContinuation visitMethods(java.util.function.BiFunction):1411:1415 -> b
-com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions -> com.android.tools.r8.internal.xX0$b:
+com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions -> com.android.tools.r8.internal.AX0$b:
     com.android.tools.r8.utils.InternalOptions this$0 -> d
     boolean $assertionsDisabled -> e
-    boolean enableConstantPropagation -> a
+    boolean enableLegacyConstantPropagation -> a
     boolean enableExperimentalArgumentPropagation -> b
     boolean enableDynamicTypePropagation -> c
-    1:1:void <clinit>():1206:1206 -> <clinit>
-    1:12:void <init>(com.android.tools.r8.utils.InternalOptions):1206:1217 -> <init>
-    1:1:boolean access$002(com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions,boolean):1206:1206 -> a
-    2:2:void disableDynamicTypePropagationForTesting():1225:1225 -> a
-    3:3:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnableExperimentalArgumentPropagation(boolean):1258:1258 -> a
-    1:2:void disableOptimization():1220:1221 -> b
-    1:1:boolean isConstantPropagationEnabled():1244:1244 -> c
-    1:1:boolean isDynamicTypePropagationEnabled():1248:1248 -> d
-    1:4:boolean isEnabled():1233:1236 -> e
-    1:1:boolean isExperimentalArgumentPropagationEnabled():1240:1240 -> f
-    1:2:void setEnableConstantPropagation():1252:1253 -> g
-com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions -> com.android.tools.r8.internal.xX0$c:
+    1:1:void <clinit>():1212:1212 -> <clinit>
+    1:12:void <init>(com.android.tools.r8.utils.InternalOptions):1212:1223 -> <init>
+    1:1:void disableDynamicTypePropagationForTesting():1231:1231 -> a
+    2:2:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnableExperimentalArgumentPropagation(boolean):1265:1265 -> a
+    1:2:void disableOptimization():1226:1227 -> b
+    1:1:boolean isConstantPropagationEnabled():1250:1250 -> c
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.isExperimentalArgumentPropagationEnabled():1246:1246 -> c
+    2:2:boolean isConstantPropagationEnabled():1250 -> c
+    1:1:boolean isDynamicTypePropagationEnabled():1254:1254 -> d
+    1:4:boolean isEnabled():1239:1242 -> e
+    1:1:boolean isExperimentalArgumentPropagationEnabled():1246:1246 -> f
+    1:2:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnableLegacyConstantPropagation():1258:1259 -> g
+com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions -> com.android.tools.r8.internal.AX0$c:
     boolean sortMethodsOnCfOutput -> a
     boolean allowAllDesugaredInput -> b
     boolean noCfMarkerForDesugaredCode -> c
-    1:12:void <init>():1192:1203 -> <init>
-com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.internal.xX0$d:
+    1:12:void <init>():1198:1209 -> <init>
+com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.internal.AX0$d:
     com.android.tools.r8.utils.InternalOptions$DesugarState ON -> b
     com.android.tools.r8.utils.InternalOptions$DesugarState OFF -> a
     1:2:void <clinit>():115:116 -> <clinit>
     1:1:void <init>(java.lang.String,int):114:114 -> <init>
     1:1:boolean isOff():119:119 -> a
     1:1:boolean isOn():123:123 -> b
-com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions -> com.android.tools.r8.internal.xX0$e:
+com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions -> com.android.tools.r8.internal.AX0$e:
     com.android.tools.r8.utils.InternalOptions this$0 -> f
     boolean $assertionsDisabled -> g
     int maxGroupSize -> e
@@ -130151,35 +130400,35 @@ com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions -> com.a
     1:1:boolean isSyntheticMergingEnabled():1323:1323 -> f
     1:1:void setEnableInterfaceMergingInInitial():1339:1339 -> g
     1:1:void setRestrictToSynthetics():1347:1347 -> h
-com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.internal.yX0:
+com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.internal.BX0:
     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):786:789 -> <init>
-com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.internal.zX0:
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):792:795 -> <init>
+com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.internal.CX0:
     boolean disableKotlinSpecificOptimizations -> a
-    1:3:void <init>():1185:1187 -> <init>
-com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.internal.xX0$f:
+    1:3:void <init>():1191:1193 -> <init>
+com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.internal.AX0$f:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> a
     1:2:void <clinit>():110:111 -> <clinit>
     1:1:void <init>(java.lang.String,int):109:109 -> <init>
-com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.internal.xX0$g:
+com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.internal.AX0$g:
     int threshold -> d
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:5:void <init>():1178:1182 -> <init>
-com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.internal.xX0$h:
+    1:5:void <init>():1184:1188 -> <init>
+com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.internal.AX0$h:
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode FLATTEN -> d
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode REPACKAGE -> c
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode MINIFICATION -> b
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode NONE -> a
-    1:8:void <clinit>():1148:1155 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1146:1146 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1158:1158 -> a
-    1:1:boolean isSome():1174 -> a
-com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.internal.xX0$i:
+    1:8:void <clinit>():1154:1161 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1152:1152 -> <init>
+    1:1:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1164:1164 -> a
+    1:1:boolean isSome():1180 -> a
+com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.internal.AX0$i:
     boolean enableEnumLiteProtoShrinking -> e
     boolean enableGeneratedExtensionRegistryShrinking -> a
     boolean enableGeneratedMessageLiteShrinking -> b
@@ -130189,7 +130438,7 @@ com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.
     1:1:boolean enableRemoveProtoEnumSwitchMap():1458:1458 -> a
     1:1:boolean isEnumLiteProtoShrinkingEnabled():1469:1469 -> b
     1:1:boolean isProtoShrinkingEnabled():1462:1462 -> c
-com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.internal.xX0$j:
+com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.internal.AX0$j:
     boolean allowClassInliningOfSynthetics -> m
     boolean enableD8ResourcesPassThrough -> d0
     java.util.function.BiConsumer unboxedEnumsConsumer -> i
@@ -130263,20 +130512,20 @@ com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r
     com.android.tools.r8.graph.DexProgramClass lambda$new$0(com.android.tools.r8.graph.AppView,java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass) -> a
     void lambda$new$1(java.util.Deque) -> a
     1:1:void allowExperimentClassFileVersion(com.android.tools.r8.utils.InternalOptions):1476:1476 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.internal.xX0$j$a:
+com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.internal.AX0$j$a:
     java.util.Comparator interfaceMethodOrdering -> a
     1:3:void <init>():1610:1612 -> <init>
     1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1616:1617 -> 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):1618:1618 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.internal.xX0$j$b:
+com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.internal.AX0$j$b:
     int numberOfProguardIfRuleMemberEvaluations -> b
     int numberOfProguardIfRuleClassEvaluations -> a
     1:4:void <init>():1628:1631 -> <init>
-com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.internal.AX0:
+com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.internal.DX0:
     com.android.tools.r8.cf.CfVersion version -> a
     com.android.tools.r8.graph.DexType type -> b
-    1:3:void <init>(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.DexType):798:800 -> <init>
-com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.internal.BX0:
+    1:3:void <init>(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.DexType):804:806 -> <init>
+com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.internal.EX0:
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> a
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> b
     com.android.tools.r8.utils.InternalOutputMode ClassFile -> c
@@ -130284,7 +130533,7 @@ com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.internal.B
     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.IterableUtils -> com.android.tools.r8.internal.iY0:
+com.android.tools.r8.utils.IterableUtils -> com.android.tools.r8.internal.lY0:
     1:7:boolean allIdentical(java.lang.Iterable,java.util.function.Function):27:33 -> a
     8:8:java.lang.Iterable filter(java.lang.Iterable,java.util.function.Predicate):92:92 -> a
     9:9:int size(java.lang.Iterable):111:111 -> a
@@ -130299,7 +130548,7 @@ com.android.tools.r8.utils.IterableUtils -> com.android.tools.r8.internal.iY0:
     2:2:java.util.Iterator com.android.tools.r8.utils.IteratorUtils.filter(java.util.Iterator,java.util.function.Predicate):49:49 -> c
     2:2:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):92 -> c
     3:3:java.lang.Iterable transform(java.lang.Iterable,java.util.function.Function):124:124 -> c
-com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.internal.rY0:
+com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.internal.uY0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:2:java.util.Iterator createCircularIterator(java.lang.Iterable):21:22 -> a
@@ -130307,15 +130556,15 @@ com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.internal.rY0:
     6:6:void lambda$countRemaining$0(com.android.tools.r8.utils.IntBox,java.lang.Object):43:43 -> a
     7:7:java.util.Iterator filter(java.util.Iterator,java.util.function.Predicate):49:49 -> a
     8:11:java.lang.Object peekNext(java.util.ListIterator):99:102 -> a
-    12:24:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):169:181 -> a
+    12:24:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):179:191 -> a
     1:3:java.lang.Object peekPrevious(java.util.ListIterator):92:94 -> b
     4:7:void removeIf(java.util.Iterator,java.util.function.Predicate):140:143 -> b
-com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.internal.pY0:
+com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.internal.sY0:
     java.util.Iterator iterator -> a
     java.lang.Iterable val$iterable -> b
     1:3:void <init>(java.lang.Iterable):22:24 -> <init>
     1:4:java.lang.Object next():33:36 -> next
-com.android.tools.r8.utils.IteratorUtils$2 -> com.android.tools.r8.internal.qY0:
+com.android.tools.r8.utils.IteratorUtils$2 -> com.android.tools.r8.internal.tY0:
     java.util.Iterator val$iterator -> b
     java.util.function.Predicate val$predicate -> c
     java.lang.Object next -> a
@@ -130324,7 +130573,7 @@ com.android.tools.r8.utils.IteratorUtils$2 -> com.android.tools.r8.internal.qY0:
     1:3:java.lang.Object advance():55:57 -> l
     1:5:java.lang.Object next():71:75 -> next
     6:6:java.lang.Object next():73:73 -> next
-com.android.tools.r8.utils.JoiningStringConsumer -> com.android.tools.r8.internal.KY0:
+com.android.tools.r8.utils.JoiningStringConsumer -> com.android.tools.r8.internal.NY0:
     com.android.tools.r8.StringConsumer consumer -> c
     java.lang.String separator -> b
     java.lang.StringBuilder builder -> d
@@ -130333,7 +130582,7 @@ com.android.tools.r8.utils.JoiningStringConsumer -> com.android.tools.r8.interna
     1:1:com.android.tools.r8.StringConsumer getConsumer():42:42 -> a
     1:4:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):29:32 -> accept
     1:2:void finished(com.android.tools.r8.DiagnosticsHandler):37:38 -> finished
-com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.internal.Q31:
+com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.internal.T31:
     int columnCapacity -> b
     int rowCapacity -> a
     1:3:void <init>(int,int,float):31:33 -> <init>
@@ -130341,15 +130590,15 @@ com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.internal.Q31:
     2:3:java.lang.Object put(java.lang.Object,java.lang.Object,java.lang.Object):46:47 -> a
     1:1:com.android.tools.r8.utils.LRUCacheTable create(int,int):37:37 -> b
     1:1:boolean removeEldestEntry(java.util.Map$Entry):42:42 -> removeEldestEntry
-com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.internal.P31:
+com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.internal.S31:
     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.LazyBox -> com.android.tools.r8.internal.o41:
+com.android.tools.r8.utils.LazyBox -> com.android.tools.r8.internal.r41:
     java.util.function.Supplier supplier -> b
     1:2:void <init>(java.util.function.Supplier):13:14 -> <init>
     1:1:java.lang.Object computeIfAbsent():18:18 -> c
-com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.internal.t41:
+com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.internal.w41:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:6:int parseSleb128(com.android.tools.r8.dex.BinaryReader):65:70 -> a
@@ -130360,12 +130609,12 @@ com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.internal.t41:
     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.LensUtils -> com.android.tools.r8.internal.x41:
+com.android.tools.r8.utils.LensUtils -> com.android.tools.r8.internal.A41:
     1:4:void rewriteAndApplyIfNotPrimitiveType(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexReference,java.util.function.Consumer):28:31 -> a
     5:5:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
     5:5:void rewriteAndApplyIfNotPrimitiveType(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexReference,java.util.function.Consumer):31 -> a
     6:9:void rewriteAndApplyIfNotPrimitiveType(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexReference,java.util.function.Consumer):31:34 -> a
-com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.internal.y41:
+com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.internal.B41:
     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
@@ -130375,7 +130624,7 @@ com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.intern
     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.internal.W41:
+com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.internal.Z41:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():68:68 -> <clinit>
     1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> a
@@ -130399,12 +130648,12 @@ com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.internal.
     47:65:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):332:350 -> a
     66:66:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):502:502 -> a
     66:66:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):350 -> a
-    67:67:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():472:472 -> a
+    67:67:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():478:478 -> a
     67:67:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):502 -> a
     67:67:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):350 -> a
     68:83:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):502:517 -> a
     68:83:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):350 -> a
-    84:84:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():595:595 -> a
+    84:84:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():601:601 -> a
     84:84:boolean com.android.tools.r8.shaking.KeepInfoCollection.isMinificationAllowed(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):185 -> a
     84:84:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):517 -> a
     84:84:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):350 -> a
@@ -130457,7 +130706,7 @@ com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.internal.
     436:449:int getMethodStartLine(com.android.tools.r8.graph.DexEncodedMethod):543:556 -> a
     450:450:void sortMethods(java.util.List):565:565 -> a
     451:452:int lambda$sortMethods$8(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):567:568 -> a
-    453:453:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1398:1398 -> a
+    453:453:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1341:1341 -> a
     453:453:int lambda$sortMethods$8(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):571 -> a
     454:454:void addFieldsToClassNaming(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.function.Supplier):593:593 -> a
     455:462:void lambda$addFieldsToClassNaming$9(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):595:602 -> a
@@ -130476,7 +130725,7 @@ com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.internal.
     1:1:void lambda$run$3(java.lang.Object):419 -> c
     1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> d
     1:1:void lambda$run$7(java.lang.Object):490 -> d
-com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.internal.O41:
+com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.internal.R41:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> i
     com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter val$positionEventEmitter -> h
@@ -130494,7 +130743,7 @@ com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.interna
     20:21:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):747:748 -> a
     22:23:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):753:754 -> a
     1:3:void flushPc():693:695 -> f
-com.android.tools.r8.utils.LineNumberOptimizer$2 -> com.android.tools.r8.internal.P41:
+com.android.tools.r8.utils.LineNumberOptimizer$2 -> com.android.tools.r8.internal.S41:
     com.android.tools.r8.utils.Pair val$lastPosition -> g
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> h
     boolean $assertionsDisabled -> j
@@ -130504,11 +130753,11 @@ com.android.tools.r8.utils.LineNumberOptimizer$2 -> com.android.tools.r8.interna
     1:7:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):792:798 -> a
     8:21:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):795:808 -> a
     22:22:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):803:803 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.internal.Q41:
+com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.internal.T41:
     1:1:void <init>():76:76 -> <init>
     2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):76:76 -> <init>
     1:1:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):80:80 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.internal.R41:
+com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.internal.U41:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parsedData -> g
     java.util.Map parsedKotlinSourceDebugExtensions -> c
@@ -130534,7 +130783,7 @@ com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemap
     39:41:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):163 -> a
     42:52:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):164:174 -> a
     53:79:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):171:197 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.internal.S41:
+com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.internal.V41:
     int obfuscatedLine -> d
     int originalLine -> b
     com.android.tools.r8.ir.code.Position caller -> c
@@ -130545,7 +130794,7 @@ com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.too
     1:1:int access$400(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):268:268 -> b
     1:1:com.android.tools.r8.graph.DexMethod access$500(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):268:268 -> c
     1:1:com.android.tools.r8.ir.code.Position access$600(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):268:268 -> d
-com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.internal.T41:
+com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.internal.W41:
     boolean $assertionsDisabled -> e
     int nextOptimizedLineNumber -> d
     com.android.tools.r8.graph.DexMethod previousMethod -> b
@@ -130555,7 +130804,7 @@ com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):90:90 -> <init>
     2:10:void <init>(com.android.tools.r8.utils.InternalOptions):86:94 -> <init>
     1:15:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):99:113 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.internal.U41:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.internal.X41:
     java.util.List processedEvents -> f
     int previousPc -> d
     boolean $assertionsDisabled -> g
@@ -130573,23 +130822,25 @@ com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.andro
     3:16:void access$1000(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int,com.android.tools.r8.ir.code.Position):224 -> a
     17:18:int com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.getStartLine():262:263 -> a
     17:18:int access$1100(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):224 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.internal.V41:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.internal.Y41:
     com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position) -> a
-com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.internal.j51:
+com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.internal.m51:
     1:2:java.util.List flatMap(java.util.List,java.util.function.Function):52:53 -> a
     3:3:void lambda$flatMap$0(java.util.List,java.util.function.Function,java.lang.Object):53:53 -> a
     4:4:java.lang.Object first(java.util.List):69:69 -> a
-    5:6:int firstIndexMatching(java.util.List,java.util.function.Predicate):78:79 -> a
-    7:9:java.util.List map(java.util.Collection,java.util.function.Function):108:110 -> a
-    10:25:java.util.List mapOrElse(java.util.List,java.util.function.Function,java.util.List):132:147 -> a
-    26:27:java.util.ArrayList newArrayList(com.android.tools.r8.utils.ForEachable):176:177 -> a
-    28:29:java.util.LinkedList newLinkedList(java.lang.Object):188:189 -> a
-    30:31:void forEachWithIndex(java.util.List,com.android.tools.r8.utils.ListUtils$ReferenceAndIntConsumer):229:230 -> a
-    1:1:java.lang.Object last(java.util.List):87:87 -> b
-    2:3:int lastIndexMatching(java.util.List,java.util.function.Predicate):91:92 -> b
-    4:6:com.android.tools.r8.com.google.common.collect.ImmutableList newImmutableList(com.android.tools.r8.utils.ForEachable):182:184 -> b
-com.android.tools.r8.utils.ListUtils$ReferenceAndIntConsumer -> com.android.tools.r8.internal.i51:
-com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.internal.Y51:
+    5:7:java.util.List map(java.util.Collection,java.util.function.Function):108:110 -> a
+    8:23:java.util.List mapOrElse(java.util.List,java.util.function.Function,java.util.List):132:147 -> a
+    24:24:java.util.List filterOrElse(java.util.List,java.util.function.Predicate):167:167 -> a
+    25:25:java.lang.Object lambda$filterOrElse$2(java.util.function.Predicate,java.lang.Object):167:167 -> a
+    26:27:java.util.ArrayList newArrayList(com.android.tools.r8.utils.ForEachable):184:185 -> a
+    28:29:java.util.LinkedList newLinkedList(java.lang.Object):196:197 -> a
+    30:31:void forEachWithIndex(java.util.List,com.android.tools.r8.utils.ListUtils$ReferenceAndIntConsumer):237:238 -> a
+    1:2:int firstIndexMatching(java.util.List,java.util.function.Predicate):78:79 -> b
+    3:3:java.lang.Object last(java.util.List):87:87 -> b
+    4:6:com.android.tools.r8.com.google.common.collect.ImmutableList newImmutableList(com.android.tools.r8.utils.ForEachable):190:192 -> b
+    1:2:int lastIndexMatching(java.util.List,java.util.function.Predicate):91:92 -> c
+com.android.tools.r8.utils.ListUtils$ReferenceAndIntConsumer -> com.android.tools.r8.internal.l51:
+com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.internal.b61:
     long max -> b
     long min -> a
     boolean $assertionsDisabled -> c
@@ -130605,7 +130856,7 @@ com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.internal.Y51:
     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.MainDexListParser -> com.android.tools.r8.internal.p61:
+com.android.tools.r8.utils.MainDexListParser -> com.android.tools.r8.internal.s61:
     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
@@ -130620,7 +130871,7 @@ com.android.tools.r8.utils.MainDexListParser -> com.android.tools.r8.internal.p6
     36:36:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
     36:36:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):37 -> a
     37:37:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory) -> a
-com.android.tools.r8.utils.MapUtils -> com.android.tools.r8.internal.r61:
+com.android.tools.r8.utils.MapUtils -> com.android.tools.r8.internal.u61:
     1:1:java.util.Map clone(java.util.Map,java.util.Map,java.util.function.Function):19:19 -> a
     2:2:void lambda$clone$0(java.util.Map,java.util.function.Function,java.lang.Object,java.lang.Object):19:19 -> a
     3:3:java.util.function.Function ignoreKey(java.util.function.Supplier):32:32 -> a
@@ -130635,7 +130886,7 @@ com.android.tools.r8.utils.MapUtils -> com.android.tools.r8.internal.r61:
     1:1:java.lang.String lambda$toString$4(java.util.Map$Entry):51:51 -> b
     2:2:java.lang.String toString(java.util.Map):51:51 -> b
     3:3:java.lang.String toString(java.util.Map):50:50 -> b
-com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.internal.E71:
+com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.internal.H71:
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE -> b
     boolean ignoreName -> a
@@ -130649,7 +130900,7 @@ com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r
     7:10:int doHash(java.lang.Object):15 -> a
     11:11:com.android.tools.r8.utils.MethodJavaSignatureEquivalence get():30:30 -> a
     1:1:com.android.tools.r8.utils.MethodJavaSignatureEquivalence getEquivalenceIgnoreName():34:34 -> b
-com.android.tools.r8.utils.MethodReferenceUtils -> com.android.tools.r8.internal.N71:
+com.android.tools.r8.utils.MethodReferenceUtils -> com.android.tools.r8.internal.Q71:
     int $r8$clinit -> b
     java.util.Comparator COMPARATOR -> a
     1:1:void <clinit>():24:24 -> <clinit>
@@ -130689,7 +130940,7 @@ com.android.tools.r8.utils.MethodReferenceUtils -> com.android.tools.r8.internal
     27:27:int com.android.tools.r8.utils.CompareResult.getComparisonResult():21:21 -> b
     27:27:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):52 -> b
     28:28:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):55:55 -> b
-com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.internal.P71:
+com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.internal.S71:
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(boolean):23:23 -> <init>
@@ -130700,12 +130951,12 @@ com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.in
     4:4:int com.android.tools.r8.utils.MethodSignatureEquivalence.doHash(com.android.tools.r8.graph.DexMethod):48:48 -> a
     4:4:int doHash(java.lang.Object):14 -> a
     5:5:com.android.tools.r8.utils.MethodSignatureEquivalence get():28:28 -> a
-com.android.tools.r8.utils.NumberUtils -> com.android.tools.r8.internal.Na1:
+com.android.tools.r8.utils.NumberUtils -> com.android.tools.r8.internal.Qa1:
     boolean is16Bit(long) -> a
     boolean is32Bit(long) -> b
-com.android.tools.r8.utils.ObjectUtils -> com.android.tools.r8.internal.gd1:
+com.android.tools.r8.utils.ObjectUtils -> com.android.tools.r8.internal.jd1:
     1:1:boolean getBooleanOrElse(java.lang.Object,java.util.function.Predicate,boolean):14:14 -> a
-com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.internal.ld1:
+com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.internal.od1:
     com.android.tools.r8.utils.OffOrAuto Auto -> b
     com.android.tools.r8.utils.OffOrAuto Off -> a
     com.android.tools.r8.utils.OffOrAuto[] $VALUES -> c
@@ -130727,7 +130978,7 @@ com.android.tools.r8.utils.OneShotByteResource -> com.android.tools.r8.utils.A:
     1:1:java.util.Set getClassDescriptors():59:59 -> getClassDescriptors
     1:1:com.android.tools.r8.ProgramResource$Kind getKind():41:41 -> getKind
     1:1:com.android.tools.r8.origin.Origin getOrigin():36:36 -> getOrigin
-com.android.tools.r8.utils.OptionalBool -> com.android.tools.r8.internal.zd1:
+com.android.tools.r8.utils.OptionalBool -> com.android.tools.r8.internal.Cd1:
     com.android.tools.r8.utils.OptionalBool UNKNOWN -> c
     com.android.tools.r8.utils.OptionalBool TRUE -> a
     com.android.tools.r8.utils.OptionalBool FALSE -> b
@@ -130736,22 +130987,22 @@ com.android.tools.r8.utils.OptionalBool -> com.android.tools.r8.internal.zd1:
     1:1:com.android.tools.r8.utils.OptionalBool of(boolean):69:69 -> a
     int ordinal() -> f
     1:1:int hashCode():88:88 -> hashCode
-com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.internal.wd1:
+com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.internal.zd1:
     1:1:void <init>():10:10 -> <init>
     boolean isTrue() -> d
     int ordinal() -> f
     1:1:java.lang.String toString():24:24 -> toString
-com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.internal.xd1:
+com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.internal.Ad1:
     1:1:void <init>():29:29 -> <init>
     boolean isFalse() -> a
     int ordinal() -> f
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.internal.yd1:
+com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.internal.Bd1:
     1:1:void <init>():48:48 -> <init>
     boolean isUnknown() -> e
     int ordinal() -> f
     1:1:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.internal.Cd1:
+com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.internal.Fd1:
     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
@@ -130759,14 +131010,14 @@ com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.internal.Cd1:
     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.internal.Bd1:
+com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.internal.Ed1:
     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.OriginWithPosition -> com.android.tools.r8.internal.Hd1:
+com.android.tools.r8.utils.OriginWithPosition -> com.android.tools.r8.internal.Kd1:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.Position position -> b
     1:3:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):14:16 -> <init>
@@ -130774,14 +131025,14 @@ com.android.tools.r8.utils.OriginWithPosition -> com.android.tools.r8.internal.H
     1:1:com.android.tools.r8.position.Position getPosition():24:24 -> b
     1:3:boolean equals(java.lang.Object):34:36 -> equals
     1:1:int hashCode():29:29 -> hashCode
-com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.internal.Vd1:
+com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.internal.Yd1:
     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.internal.ce1:
+com.android.tools.r8.utils.Pair -> com.android.tools.r8.internal.fe1:
 # {"id":"sourceFile","fileName":"Pair.java"}
     java.lang.Object second -> b
     java.lang.Object first -> a
@@ -130794,7 +131045,7 @@ com.android.tools.r8.utils.Pair -> com.android.tools.r8.internal.ce1:
     1:1:boolean equals(java.lang.Object):51:51 -> equals
     1:1:int hashCode():46:46 -> hashCode
     1:1:java.lang.String toString():56:56 -> toString
-com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.internal.Fe1:
+com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.internal.Ie1:
     java.util.List predicates -> b
     java.util.Set elements -> a
     1:4:void <init>():14:17 -> <init>
@@ -130803,13 +131054,13 @@ com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.internal.Fe1:
     3:3:com.android.tools.r8.utils.PredicateSet empty():28:28 -> a
     4:10:com.android.tools.r8.utils.PredicateSet rewriteItems(java.util.function.Function):32:38 -> a
     1:5:boolean contains(java.lang.Object):43:47 -> b
-com.android.tools.r8.utils.PredicateUtils -> com.android.tools.r8.internal.Ge1:
+com.android.tools.r8.utils.PredicateUtils -> com.android.tools.r8.internal.Je1:
     1:2:java.lang.Object findFirst(java.lang.Object[],java.util.function.Predicate):13:14 -> a
     3:3:boolean lambda$not$0(java.util.function.Predicate,java.lang.Object):22:22 -> a
     4:4:java.util.function.Predicate not(java.util.function.Predicate):22:22 -> a
     5:5:java.util.function.Predicate isNull(java.util.function.Function):26:26 -> a
     6:6:boolean lambda$isNull$1(java.util.function.Function,java.lang.Object):26:26 -> a
-com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.internal.Se1:
+com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.internal.Ve1:
     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>
@@ -130828,8 +131079,8 @@ com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.in
     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.internal.Re1:
-com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.internal.Se1$a:
+com.android.tools.r8.utils.PreloadedClassFileProvider$1 -> com.android.tools.r8.internal.Ue1:
+com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.internal.Ve1$a:
     java.util.Map content -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():74:74 -> <clinit>
@@ -130838,11 +131089,11 @@ com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.too
     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.internal.Te1:
+com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.internal.We1:
     java.lang.String descriptor -> e
     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.internal.mf1:
+com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.internal.pf1:
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver conflictResolver -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():18:18 -> <clinit>
@@ -130876,7 +131127,7 @@ com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.intern
     6:6:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):74:74 -> b
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():57:57 -> c
     1:1:java.lang.String toString():42:42 -> toString
-com.android.tools.r8.utils.ProgramMethodEquivalence -> com.android.tools.r8.internal.vf1:
+com.android.tools.r8.utils.ProgramMethodEquivalence -> com.android.tools.r8.internal.yf1:
     com.android.tools.r8.utils.ProgramMethodEquivalence INSTANCE -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -130887,17 +131138,17 @@ com.android.tools.r8.utils.ProgramMethodEquivalence -> com.android.tools.r8.inte
     4:4:int com.android.tools.r8.utils.ProgramMethodEquivalence.doHash(com.android.tools.r8.graph.ProgramMethod):27:27 -> a
     4:4:int doHash(java.lang.Object):10 -> a
     5:5:com.android.tools.r8.utils.ProgramMethodEquivalence get():17:17 -> a
-com.android.tools.r8.utils.ReflectionHelper -> com.android.tools.r8.internal.wk1:
-com.android.tools.r8.utils.ReflectionHelper$1 -> com.android.tools.r8.internal.qk1:
-com.android.tools.r8.utils.ReflectionHelper$ReflectiveFieldOperation -> com.android.tools.r8.internal.rk1:
+com.android.tools.r8.utils.ReflectionHelper -> com.android.tools.r8.internal.uk1:
+com.android.tools.r8.utils.ReflectionHelper$1 -> com.android.tools.r8.internal.ok1:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveFieldOperation -> com.android.tools.r8.internal.pk1:
     1:1:void <init>(java.lang.Class,java.lang.String,com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation,java.util.function.Consumer,com.android.tools.r8.utils.ReflectionHelper$1):72:72 -> <init>
     2:2:void <init>(java.lang.Class,java.lang.String,com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation,java.util.function.Consumer):79:79 -> <init>
     1:5:java.lang.Object compute(java.lang.Object):84:88 -> a
-com.android.tools.r8.utils.ReflectionHelper$ReflectiveMethodOperation -> com.android.tools.r8.internal.sk1:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveMethodOperation -> com.android.tools.r8.internal.qk1:
     1:1:void <init>(java.lang.Class,java.lang.String,com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation,java.util.function.Consumer,com.android.tools.r8.utils.ReflectionHelper$1):51:51 -> <init>
     2:2:void <init>(java.lang.Class,java.lang.String,com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation,java.util.function.Consumer):58:58 -> <init>
     1:6:java.lang.Object compute(java.lang.Object):63:68 -> a
-com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation -> com.android.tools.r8.internal.tk1:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation -> com.android.tools.r8.internal.rk1:
     java.util.function.Consumer modifier -> c
     com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation nextOperation -> d
     java.lang.Class classForDeclaration -> a
@@ -130905,7 +131156,7 @@ com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation -> com.android.t
     1:1:void <init>(java.lang.Class,java.lang.String,com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation,java.util.function.Consumer,com.android.tools.r8.utils.ReflectionHelper$1):30:30 -> <init>
     2:6:void <init>(java.lang.Class,java.lang.String,com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation,java.util.function.Consumer):41:45 -> <init>
     java.lang.Object compute(java.lang.Object) -> a
-com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder -> com.android.tools.r8.internal.uk1:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder -> com.android.tools.r8.internal.sk1:
     com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationSequenceBuilder sequenceBuilder -> d
     boolean $assertionsDisabled -> e
     java.lang.String declaredMember -> a
@@ -130921,7 +131172,7 @@ com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder -> com.an
     4:16:com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation build(com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation):147:159 -> a
     17:18:void lambda$build$0(java.lang.reflect.Field):153:154 -> a
     19:20:void lambda$build$1(java.lang.reflect.Method):164:165 -> a
-com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationSequenceBuilder -> com.android.tools.r8.internal.vk1:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationSequenceBuilder -> com.android.tools.r8.internal.tk1:
     java.util.List reflectiveOperationBuilderList -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():92:92 -> <clinit>
@@ -130931,7 +131182,7 @@ com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationSequenceBuilder -
     4:7:com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation build():112:115 -> a
     1:3:com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationSequenceBuilder.add(java.lang.String,com.android.tools.r8.utils.ReflectionHelper$DeclaredType):105:107 -> b
     1:3:com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder readMethod(java.lang.String):97 -> b
-com.android.tools.r8.utils.Reporter -> com.android.tools.r8.internal.kl1:
+com.android.tools.r8.utils.Reporter -> com.android.tools.r8.internal.il1:
     java.util.List diagnosticsLevelMapping -> b
     com.android.tools.r8.DiagnosticsHandler clientHandler -> a
     com.android.tools.r8.utils.AbortException abort -> c
@@ -130955,19 +131206,19 @@ com.android.tools.r8.utils.Reporter -> com.android.tools.r8.internal.kl1:
     1:1:void error(com.android.tools.r8.Diagnostic):109:109 -> error
     1:1:void info(com.android.tools.r8.Diagnostic):91:91 -> info
     1:1:void warning(com.android.tools.r8.Diagnostic):100:100 -> warning
-com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.internal.hl1:
+com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.internal.fl1:
     1:1:void <init>():56:56 -> <init>
-com.android.tools.r8.utils.Reporter$2 -> com.android.tools.r8.internal.il1:
+com.android.tools.r8.utils.Reporter$2 -> com.android.tools.r8.internal.gl1:
     int[] $SwitchMap$com$android$tools$r8$DiagnosticsLevel -> a
     1:1:void <clinit>():73:73 -> <clinit>
-com.android.tools.r8.utils.Reporter$DiagnosticsLevelMapping -> com.android.tools.r8.internal.jl1:
+com.android.tools.r8.utils.Reporter$DiagnosticsLevelMapping -> com.android.tools.r8.internal.hl1:
     com.android.tools.r8.DiagnosticsLevel from -> a
     com.android.tools.r8.DiagnosticsLevel to -> b
     java.lang.String diagnosticsClassName -> c
     1:4:void <init>(com.android.tools.r8.DiagnosticsLevel,com.android.tools.r8.DiagnosticsLevel,java.lang.String):25:28 -> <init>
     1:13:com.android.tools.r8.DiagnosticsLevel map(com.android.tools.r8.DiagnosticsLevel,com.android.tools.r8.Diagnostic):32:44 -> a
     14:14:com.android.tools.r8.DiagnosticsLevel map(com.android.tools.r8.DiagnosticsLevel,com.android.tools.r8.Diagnostic):38:38 -> a
-com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.internal.xm1:
+com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.internal.pm1:
     java.util.TreeMap internalTree -> a
     boolean allowIntervalOverwrites -> b
     int size -> c
@@ -130980,7 +131231,7 @@ com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.internal.xm1:
     5:44:com.android.tools.r8.utils.SegmentTree add(int,int,java.lang.Object):36:75 -> a
     45:48:boolean lambda$add$0(int,int,com.android.tools.r8.utils.Box,java.lang.Integer):43:46 -> a
     49:49:int size():80:80 -> a
-com.android.tools.r8.utils.SemanticVersion -> com.android.tools.r8.internal.ym1:
+com.android.tools.r8.utils.SemanticVersion -> com.android.tools.r8.internal.qm1:
     int minor -> b
     int patch -> c
     int major -> a
@@ -130996,24 +131247,25 @@ com.android.tools.r8.utils.SemanticVersion -> com.android.tools.r8.internal.ym1:
     1:5:boolean equals(java.lang.Object):68:72 -> equals
     1:1:int hashCode():77:77 -> hashCode
     1:1:java.lang.String toString():82:82 -> toString
-com.android.tools.r8.utils.SetUtils -> com.android.tools.r8.internal.Bm1:
-    1:2:java.util.HashSet newHashSet(java.lang.Object):27:28 -> a
-    3:4:java.util.Set newIdentityHashSet(com.android.tools.r8.utils.ForEachable):45:46 -> a
-    5:6:java.util.Set newIdentityHashSet(java.lang.Iterable):51:52 -> a
-    7:9:java.util.Set newIdentityHashSet(java.lang.Iterable,java.lang.Iterable):57:59 -> a
-    10:13:java.util.Set newIdentityHashSet(java.lang.Iterable,java.lang.Iterable,java.lang.Iterable):64:67 -> a
-    14:14:java.util.Set newIdentityHashSet(int):72:72 -> a
-    15:17:java.util.Set mapIdentityHashSet(java.util.Set,java.util.function.Function):88:90 -> a
-    1:2:java.util.Set newIdentityHashSet(java.lang.Object):33:34 -> b
-    3:5:com.android.tools.r8.com.google.common.collect.ImmutableSet newImmutableSet(com.android.tools.r8.utils.ForEachable):82:84 -> b
-com.android.tools.r8.utils.SortingStringConsumer -> com.android.tools.r8.internal.Fn1:
+com.android.tools.r8.utils.SetUtils -> com.android.tools.r8.internal.tm1:
+    1:1:java.util.Set newConcurrentHashSet(int):28:28 -> a
+    2:3:java.util.HashSet newHashSet(java.lang.Object):32:33 -> a
+    4:5:java.util.Set newIdentityHashSet(com.android.tools.r8.utils.ForEachable):50:51 -> a
+    6:7:java.util.Set newIdentityHashSet(java.lang.Iterable):56:57 -> a
+    8:10:java.util.Set newIdentityHashSet(java.lang.Iterable,java.lang.Iterable):62:64 -> a
+    11:14:java.util.Set newIdentityHashSet(java.lang.Iterable,java.lang.Iterable,java.lang.Iterable):69:72 -> a
+    15:17:java.util.Set mapIdentityHashSet(java.util.Set,java.util.function.Function):93:95 -> a
+    1:2:java.util.Set newIdentityHashSet(java.lang.Object):38:39 -> b
+    3:3:java.util.Set newIdentityHashSet(int):77:77 -> b
+    4:6:com.android.tools.r8.com.google.common.collect.ImmutableSet newImmutableSet(com.android.tools.r8.utils.ForEachable):87:89 -> b
+com.android.tools.r8.utils.SortingStringConsumer -> com.android.tools.r8.internal.xn1:
     java.util.List accepted -> b
     1:1:void <init>(com.android.tools.r8.StringConsumer):24:24 -> <init>
     2:2:void <init>(com.android.tools.r8.StringConsumer):17:17 -> <init>
     1:1:void lambda$finished$0(com.android.tools.r8.DiagnosticsHandler,java.lang.String):35:35 -> a
     1:1:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):29:29 -> accept
     1:3:void finished(com.android.tools.r8.DiagnosticsHandler):34:36 -> finished
-com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.internal.Fo1:
+com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.internal.xo1:
     1:2:byte[] StreamToByteArrayClose(java.io.InputStream):17:18 -> a
 com.android.tools.r8.utils.StringDiagnostic -> com.android.tools.r8.utils.StringDiagnostic:
     com.android.tools.r8.origin.Origin origin -> a
@@ -131027,7 +131279,7 @@ com.android.tools.r8.utils.StringDiagnostic -> com.android.tools.r8.utils.String
     1:1:java.lang.String getDiagnosticMessage():56:56 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():46:46 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():51:51 -> getPosition
-com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.internal.mp1:
+com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.internal.ep1:
     char[] EMPTY_CHAR_ARRAY -> a
     java.lang.String LINE_SEPARATOR -> c
     java.lang.String[] EMPTY_ARRAY -> b
@@ -131084,10 +131336,10 @@ com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.internal.mp1:
     1:9:java.lang.String toASCIIString(java.lang.String):53:61 -> d
     1:9:java.lang.String trim(java.lang.String):296:304 -> e
     1:5:java.lang.String withNativeLineSeparator(java.lang.String):163:167 -> f
-com.android.tools.r8.utils.StringUtils$1 -> com.android.tools.r8.internal.lp1:
+com.android.tools.r8.utils.StringUtils$1 -> com.android.tools.r8.internal.dp1:
     int[] $SwitchMap$com$android$tools$r8$utils$StringUtils$BraceType -> a
     1:1:void <clinit>():32:32 -> <clinit>
-com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.internal.mp1$a:
+com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.internal.ep1$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
@@ -131097,10 +131349,10 @@ com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.interna
     5:5:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):25:25 -> <init>
     1:1:com.android.tools.r8.utils.StringUtils$BraceType[] values():25:25 -> a
-com.android.tools.r8.utils.SupplierUtils -> com.android.tools.r8.internal.Jp1:
+com.android.tools.r8.utils.SupplierUtils -> com.android.tools.r8.internal.Bp1:
     1:3:java.lang.Object lambda$memoize$1(com.android.tools.r8.utils.ThrowingSupplier):21:23 -> a
     1:1:java.util.function.Supplier memoize(com.android.tools.r8.utils.ThrowingSupplier):18:18 -> b
-com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.internal.Up1:
+com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.internal.Mp1:
     char[] IDENTIFIER_CHARACTERS -> b
     boolean $assertionsDisabled -> e
     java.util.Set PRIMITIVE_TYPE_NAMES -> a
@@ -131109,7 +131361,7 @@ com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.interna
     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.internal.Up1$a:
+com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.internal.Mp1$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>
@@ -131146,34 +131398,34 @@ com.android.tools.r8.utils.ThreadUtils -> com.android.tools.r8.utils.B:
     2:2:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):165:165 -> b
     3:3:java.util.concurrent.ExecutorService getExecutorServiceForThreads(int):172:172 -> b
     3:3:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):166 -> b
-com.android.tools.r8.utils.ThrowingAction -> com.android.tools.r8.internal.tq1:
+com.android.tools.r8.utils.ThrowingAction -> com.android.tools.r8.internal.lq1:
     void execute() -> a
-com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.internal.uq1:
-com.android.tools.r8.utils.ThrowingBiFunction -> com.android.tools.r8.internal.vq1:
-com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.internal.wq1:
+com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.internal.mq1:
+com.android.tools.r8.utils.ThrowingBiFunction -> com.android.tools.r8.internal.nq1:
+com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.internal.oq1:
     char nextChar() -> a
-com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.internal.xq1:
-com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.internal.yq1:
-com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.internal.Aq1:
+com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.internal.pq1:
+com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.internal.qq1:
+com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.internal.sq1:
     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.internal.Bq1:
+com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.internal.tq1:
     int getAsInt() -> a
-com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.internal.Cq1:
+com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.internal.uq1:
     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.ThrowingReferenceIntConsumer -> com.android.tools.r8.internal.Dq1:
-com.android.tools.r8.utils.ThrowingReferenceIntFunction -> com.android.tools.r8.internal.Eq1:
+com.android.tools.r8.utils.ThrowingReferenceIntConsumer -> com.android.tools.r8.internal.vq1:
+com.android.tools.r8.utils.ThrowingReferenceIntFunction -> com.android.tools.r8.internal.wq1:
     java.lang.Object apply(java.lang.Object,int) -> a
-com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.internal.Fq1:
-com.android.tools.r8.utils.Timing -> com.android.tools.r8.internal.Nq1:
+com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.internal.xq1:
+com.android.tools.r8.utils.Timing -> com.android.tools.r8.internal.Fq1:
     java.util.Stack stack -> b
     com.android.tools.r8.utils.Timing EMPTY -> d
     boolean $assertionsDisabled -> e
@@ -131218,20 +131470,20 @@ com.android.tools.r8.utils.Timing -> com.android.tools.r8.internal.Nq1:
     1:1:boolean access$800(com.android.tools.r8.utils.Timing):25:25 -> c
     2:3:void end():374:375 -> c
     1:6:void report():379:384 -> d
-com.android.tools.r8.utils.Timing$1 -> com.android.tools.r8.internal.Hq1:
+com.android.tools.r8.utils.Timing$1 -> com.android.tools.r8.internal.zq1:
     1:1:void <init>(java.lang.String,boolean):30:30 -> <init>
     void begin(java.lang.String) -> a
     1:1:com.android.tools.r8.utils.Timing$TimingMerger beginMerger(java.lang.String,int):33:33 -> a
     void end() -> c
     void report() -> d
-com.android.tools.r8.utils.Timing$1$1 -> com.android.tools.r8.internal.Gq1:
+com.android.tools.r8.utils.Timing$1$1 -> com.android.tools.r8.internal.yq1:
     1:1:void <init>(com.android.tools.r8.utils.Timing$1,java.lang.String,int,com.android.tools.r8.utils.Timing):33:33 -> <init>
     void add(java.util.Collection) -> a
     void end() -> a
-com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.internal.Iq1:
+com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.internal.Aq1:
     long used -> a
     1:2:void <init>(long):101:102 -> <init>
-com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.internal.Jq1:
+com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.internal.Bq1:
     java.util.Map children -> c
     long start_time -> e
     java.lang.String title -> a
@@ -131292,7 +131544,7 @@ com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.internal.Jq1:
     4:4:java.lang.String com.android.tools.r8.utils.Timing.access$300(long):25 -> toString
     4:4:java.lang.String toString():156 -> toString
     5:5:java.lang.String toString():156:156 -> toString
-com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.internal.Mq1:
+com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.internal.Eq1:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.Timing$Node slowest -> d
     int taskCount -> c
@@ -131308,7 +131560,7 @@ com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.internal.
     24:24:com.android.tools.r8.utils.Timing$Node lambda$add$0(boolean,java.lang.String):305:305 -> a
     25:26:void end():315:316 -> a
     1:1:int access$900(com.android.tools.r8.utils.Timing$TimingMerger):225:225 -> b
-com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.internal.Kq1:
+com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.internal.Cq1:
     boolean $assertionsDisabled -> k
     int val$numberOfThreads -> i
     com.android.tools.r8.utils.Timing$TimingMerger this$0 -> j
@@ -131327,23 +131579,24 @@ com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.interna
     39:39:void lambda$report$0(int,java.lang.String,com.android.tools.r8.utils.Timing$Node):259:259 -> a
     1:1:void lambda$report$1(int,java.lang.String,com.android.tools.r8.utils.Timing$Node):264:264 -> b
     1:1:java.lang.String toString():270:270 -> toString
-com.android.tools.r8.utils.Timing$TimingMerger$Item -> com.android.tools.r8.internal.Lq1:
+com.android.tools.r8.utils.Timing$TimingMerger$Item -> com.android.tools.r8.internal.Dq1:
     com.android.tools.r8.utils.Timing$Node mergeTarget -> a
     com.android.tools.r8.utils.Timing$Node mergeSource -> b
     1:3:void <init>(com.android.tools.r8.utils.Timing$Node,com.android.tools.r8.utils.Timing$Node):279:281 -> <init>
-com.android.tools.r8.utils.TraversalContinuation -> com.android.tools.r8.internal.er1:
+com.android.tools.r8.utils.TraversalContinuation -> com.android.tools.r8.internal.Wq1:
     com.android.tools.r8.utils.TraversalContinuation CONTINUE -> a
     com.android.tools.r8.utils.TraversalContinuation BREAK -> b
     1:2:void <clinit>():9:10 -> <clinit>
     1:1:void <init>(java.lang.String,int):8:8 -> <init>
     1:1:boolean shouldBreak():13:13 -> a
-com.android.tools.r8.utils.TriConsumer -> com.android.tools.r8.internal.jr1:
+    1:1:boolean shouldContinue():17:17 -> b
+com.android.tools.r8.utils.TriConsumer -> com.android.tools.r8.internal.br1:
     void accept(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.internal.kr1:
+com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.internal.cr1:
     java.lang.Object apply(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.TriPredicate -> com.android.tools.r8.internal.lr1:
+com.android.tools.r8.utils.TriPredicate -> com.android.tools.r8.internal.dr1:
     boolean test(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.TypeReferenceUtils -> com.android.tools.r8.internal.Er1:
+com.android.tools.r8.utils.TypeReferenceUtils -> com.android.tools.r8.internal.wr1:
     boolean $assertionsDisabled -> b
     java.util.Comparator COMPARATOR -> a
     1:3:void <clinit>():19:21 -> <clinit>
@@ -131362,7 +131615,7 @@ com.android.tools.r8.utils.TypeReferenceUtils -> com.android.tools.r8.internal.E
     54:54:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):95:95 -> a
     55:78:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):93:116 -> a
     79:84:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):114:119 -> a
-com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.internal.Rs1:
+com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.internal.Ks1:
     com.android.tools.r8.utils.VersionProperties INSTANCE -> c
     java.lang.String sha -> a
     java.lang.String releaser -> b
@@ -131381,7 +131634,7 @@ com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.internal.Rs
     2:2:java.lang.String getSha():57:57 -> b
     1:1:boolean isEngineering():66:66 -> c
     1:1:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.utils.Visibility -> com.android.tools.r8.internal.vt1:
+com.android.tools.r8.utils.Visibility -> com.android.tools.r8.internal.ot1:
     com.android.tools.r8.utils.Visibility[] $VALUES -> e
     com.android.tools.r8.utils.Visibility PUBLIC -> a
     com.android.tools.r8.utils.Visibility PROTECTED -> b
@@ -131399,10 +131652,10 @@ com.android.tools.r8.utils.Visibility -> com.android.tools.r8.internal.vt1:
     17:17:java.lang.String toString():41:41 -> toString
     18:18:java.lang.String toString():38:38 -> toString
     19:19:java.lang.String toString():35:35 -> toString
-com.android.tools.r8.utils.Visibility$1 -> com.android.tools.r8.internal.ut1:
+com.android.tools.r8.utils.Visibility$1 -> com.android.tools.r8.internal.nt1:
     int[] $SwitchMap$com$android$tools$r8$utils$Visibility -> a
     1:1:void <clinit>():33:33 -> <clinit>
-com.android.tools.r8.utils.WorkList -> com.android.tools.r8.internal.Ot1:
+com.android.tools.r8.utils.WorkList -> com.android.tools.r8.internal.Ht1:
     java.util.Deque workingList -> a
     java.util.Set seen -> b
     boolean $assertionsDisabled -> c
@@ -131478,12 +131731,12 @@ com.android.tools.r8.utils.ZipUtils$ZipBuilder -> com.android.tools.r8.utils.C$b
     18:18:com.android.tools.r8.utils.ZipUtils$ZipBuilder addFilesRelative(java.nio.file.Path,java.nio.file.Path[]):235:235 -> a
     19:22:com.android.tools.r8.utils.ZipUtils$ZipBuilder addBytes(java.lang.String,byte[]):239:242 -> a
     23:24:java.nio.file.Path build():247:248 -> a
-com.android.tools.r8.utils.collections.BidirectionalManyToManyMap -> com.android.tools.r8.internal.rB0:
+com.android.tools.r8.utils.collections.BidirectionalManyToManyMap -> com.android.tools.r8.internal.uB0:
     java.util.Set getKeys(java.lang.Object) -> a
-com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap -> com.android.tools.r8.internal.sB0:
+com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap -> com.android.tools.r8.internal.vB0:
     java.lang.Object getRepresentativeValue(java.lang.Object) -> b
     java.lang.Object getRepresentativeKey(java.lang.Object) -> c
-com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap -> com.android.tools.r8.internal.tB0:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap -> com.android.tools.r8.internal.wB0:
     java.util.Map backing -> a
     java.util.Map inverse -> b
     boolean $assertionsDisabled -> c
@@ -131511,10 +131764,10 @@ com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap -> com.andr
     1:1:java.util.Set keySet():87:87 -> keySet
     1:3:java.lang.Object put(java.lang.Object,java.lang.Object):139:141 -> put
     1:1:java.util.Set values():152:152 -> values
-com.android.tools.r8.utils.collections.BidirectionalManyToOneMap -> com.android.tools.r8.internal.uB0:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneMap -> com.android.tools.r8.internal.xB0:
     void forEachManyToOneMapping(java.util.function.BiConsumer) -> a
     java.util.Map getForwardMap() -> b
-com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap -> com.android.tools.r8.internal.vB0:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap -> com.android.tools.r8.internal.yB0:
     java.util.Map representatives -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():13:13 -> <clinit>
@@ -131539,8 +131792,8 @@ com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashM
     2:2:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap.removeRepresentativeFor(java.lang.Object):44:44 -> f
     2:2:java.util.Set removeValue(java.lang.Object):97 -> f
     1:1:boolean hasExplicitRepresentativeKey(java.lang.Object):54:54 -> g
-com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.wB0:
-com.android.tools.r8.utils.collections.BidirectionalOneToManyHashMap -> com.android.tools.r8.internal.xB0:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.zB0:
+com.android.tools.r8.utils.collections.BidirectionalOneToManyHashMap -> com.android.tools.r8.internal.AB0:
     java.util.Map backing -> a
     java.util.Map inverse -> b
     1:1:void <init>():21:21 -> <init>
@@ -131558,7 +131811,7 @@ com.android.tools.r8.utils.collections.BidirectionalOneToManyHashMap -> com.andr
     1:1:java.util.Set lambda$put$2(java.lang.Object):139:139 -> f
     1:1:void forEach(java.util.function.BiConsumer):47:47 -> forEach
     1:6:java.lang.Object removeValue(java.lang.Object):125:130 -> g
-com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeHashMap -> com.android.tools.r8.internal.yB0:
+com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeHashMap -> com.android.tools.r8.internal.BB0:
     java.util.Map representatives -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():12:12 -> <clinit>
@@ -131569,7 +131822,7 @@ com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeHashM
     1:2:java.lang.Object removeValue(java.lang.Object):64:65 -> g
     3:3:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeHashMap.removeRepresentativeFor(java.lang.Object):59:59 -> g
     3:3:java.lang.Object removeValue(java.lang.Object):66 -> g
-com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap -> com.android.tools.r8.internal.zB0:
+com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap -> com.android.tools.r8.internal.CB0:
     com.android.tools.r8.com.google.common.collect.BiMap backing -> a
     1:1:void <init>():22:22 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.collect.BiMap):25:26 -> <init>
@@ -131608,14 +131861,14 @@ com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap -> com.andro
     1:1:java.util.Set com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.values():169:169 -> values
     1:1:java.util.Collection values():16 -> values
     2:2:java.util.Set values():169:169 -> values
-com.android.tools.r8.utils.collections.BidirectionalOneToOneMap -> com.android.tools.r8.internal.AB0:
-com.android.tools.r8.utils.collections.DexClassAndMethodSet -> com.android.tools.r8.internal.GL0:
+com.android.tools.r8.utils.collections.BidirectionalOneToOneMap -> com.android.tools.r8.internal.DB0:
+com.android.tools.r8.utils.collections.DexClassAndMethodSet -> com.android.tools.r8.internal.JL0:
     com.android.tools.r8.utils.collections.DexClassAndMethodSet EMPTY -> d
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):22:22 -> <init>
     1:1:com.android.tools.r8.utils.collections.DexClassAndMethodSet create():32:32 -> b
     1:1:com.android.tools.r8.utils.collections.DexClassAndMethodSet empty():60:60 -> c
-com.android.tools.r8.utils.collections.DexClassAndMethodSetBase -> com.android.tools.r8.internal.HL0:
+com.android.tools.r8.utils.collections.DexClassAndMethodSetBase -> com.android.tools.r8.internal.KL0:
     java.util.Map backing -> a
     boolean $assertionsDisabled -> c
     java.util.function.Supplier backingFactory -> b
@@ -131637,7 +131890,7 @@ com.android.tools.r8.utils.collections.DexClassAndMethodSetBase -> com.android.t
     1:1:java.util.Iterator iterator():69:69 -> iterator
     1:1:int size():82:82 -> size
     1:1:java.util.stream.Stream stream():86:86 -> stream
-com.android.tools.r8.utils.collections.DexMethodSignatureSet -> com.android.tools.r8.internal.pM0:
+com.android.tools.r8.utils.collections.DexMethodSignatureSet -> com.android.tools.r8.internal.sM0:
     com.android.tools.r8.utils.collections.DexMethodSignatureSet EMPTY -> b
     java.util.Set backing -> a
     1:2:void <clinit>():22:23 -> <clinit>
@@ -131668,32 +131921,32 @@ com.android.tools.r8.utils.collections.DexMethodSignatureSet -> com.android.tool
     1:1:com.android.tools.r8.utils.collections.DexMethodSignatureSet create(com.android.tools.r8.utils.collections.DexMethodSignatureSet):36:36 -> b
     2:2:com.android.tools.r8.utils.collections.DexMethodSignatureSet createLinked():40:40 -> b
     3:3:boolean contains(com.android.tools.r8.graph.DexMethodSignature):94:94 -> b
-    4:4:boolean contains(com.android.tools.r8.graph.DexClassAndMethod):98:98 -> b
+    4:4:boolean contains(com.android.tools.r8.graph.DexClassAndMethod):102:102 -> b
     5:5:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.contains(com.android.tools.r8.graph.DexMethodSignature):94:94 -> b
-    5:5:boolean contains(com.android.tools.r8.graph.DexClassAndMethod):98 -> b
-    6:6:boolean containsAnyOf(java.lang.Iterable):107:107 -> b
-    7:7:java.util.Iterator com.android.tools.r8.utils.collections.DexMethodSignatureSet.iterator():122:122 -> b
-    7:7:boolean containsAnyOf(java.lang.Iterable):107 -> b
-    8:8:boolean containsAnyOf(java.lang.Iterable):107:107 -> b
+    5:5:boolean contains(com.android.tools.r8.graph.DexClassAndMethod):102 -> b
+    6:6:boolean containsAnyOf(java.lang.Iterable):111:111 -> b
+    7:7:java.util.Iterator com.android.tools.r8.utils.collections.DexMethodSignatureSet.iterator():126:126 -> b
+    7:7:boolean containsAnyOf(java.lang.Iterable):111 -> b
+    8:8:boolean containsAnyOf(java.lang.Iterable):111:111 -> b
     9:9:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.contains(com.android.tools.r8.graph.DexMethodSignature):94:94 -> b
-    9:9:boolean containsAnyOf(java.lang.Iterable):108 -> b
-    10:10:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):135:135 -> b
-    11:11:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.remove(com.android.tools.r8.graph.DexMethodSignature):131:131 -> b
-    11:11:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):135 -> b
+    9:9:boolean containsAnyOf(java.lang.Iterable):112 -> b
+    10:10:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):139:139 -> b
+    11:11:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.remove(com.android.tools.r8.graph.DexMethodSignature):135:135 -> b
+    11:11:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):139 -> b
     1:1:com.android.tools.r8.utils.collections.DexMethodSignatureSet empty():44:44 -> c
-    2:2:void removeAllMethods(java.lang.Iterable):144:144 -> c
+    2:2:void removeAllMethods(java.lang.Iterable):148:148 -> c
     1:1:void clear():85:85 -> clear
     1:1:boolean contains(java.lang.Object):90:90 -> contains
-    1:1:boolean containsAll(java.util.Collection):103:103 -> containsAll
-    1:1:boolean isEmpty():117:117 -> isEmpty
-    1:1:java.util.Iterator iterator():122:122 -> iterator
-    1:1:boolean remove(java.lang.Object):127:127 -> remove
-    1:1:boolean removeAll(java.util.Collection):140:140 -> removeAll
-    1:1:boolean retainAll(java.util.Collection):149:149 -> retainAll
-    1:1:int size():154:154 -> size
-    1:1:java.lang.Object[] toArray():159:159 -> toArray
-    2:2:java.lang.Object[] toArray(java.lang.Object[]):164:164 -> toArray
-com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap -> com.android.tools.r8.internal.XM0:
+    1:1:boolean containsAll(java.util.Collection):107:107 -> containsAll
+    1:1:boolean isEmpty():121:121 -> isEmpty
+    1:1:java.util.Iterator iterator():126:126 -> iterator
+    1:1:boolean remove(java.lang.Object):131:131 -> remove
+    1:1:boolean removeAll(java.util.Collection):144:144 -> removeAll
+    1:1:boolean retainAll(java.util.Collection):153:153 -> retainAll
+    1:1:int size():158:158 -> size
+    1:1:java.lang.Object[] toArray():163:163 -> toArray
+    2:2:java.lang.Object[] toArray(java.lang.Object[]):168:168 -> toArray
+com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap -> com.android.tools.r8.internal.aN0:
     1:1:void <init>():15:15 -> <init>
     void forEachManyToOneMapping(java.util.function.BiConsumer) -> a
     1:1:java.util.Set getKeys(java.lang.Object):92:92 -> a
@@ -131703,7 +131956,7 @@ com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap -> com.andr
     java.lang.Object getRepresentativeKey(java.lang.Object) -> c
     1:1:java.util.Set keySet():107:107 -> keySet
     1:1:java.util.Set values():112:112 -> values
-com.android.tools.r8.utils.collections.IdentityHashSetFromMap -> com.android.tools.r8.internal.kS0:
+com.android.tools.r8.utils.collections.IdentityHashSetFromMap -> com.android.tools.r8.internal.nS0:
     java.util.Map backing -> a
     java.util.function.Function valueToKeyMapping -> b
     1:1:void <init>(java.util.function.Function):21:21 -> <init>
@@ -131728,7 +131981,7 @@ com.android.tools.r8.utils.collections.IdentityHashSetFromMap -> com.android.too
     1:1:int size():31:31 -> size
     1:1:java.lang.Object[] toArray():52:52 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):57:57 -> toArray
-com.android.tools.r8.utils.collections.ImmutableDeque -> com.android.tools.r8.internal.vS0:
+com.android.tools.r8.utils.collections.ImmutableDeque -> com.android.tools.r8.internal.yS0:
     boolean isClosed -> a
     1:1:void <init>(java.util.Collection):20:20 -> <init>
     2:2:void <init>(java.util.Collection):17:17 -> <init>
@@ -131752,7 +132005,7 @@ com.android.tools.r8.utils.collections.ImmutableDeque -> com.android.tools.r8.in
     1:1:boolean removeIf(java.util.function.Predicate):73:73 -> removeIf
     1:1:java.lang.Object removeLast():83:83 -> removeLast
     1:1:boolean removeLastOccurrence(java.lang.Object):78:78 -> removeLastOccurrence
-com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap -> com.android.tools.r8.internal.BS0:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap -> com.android.tools.r8.internal.ES0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap sortedMap -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$1):17:17 -> <init>
     2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap):21:22 -> <init>
@@ -131822,13 +132075,13 @@ com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap -> com.an
     1:1:java.util.SortedMap tailMap(java.lang.Object):17:17 -> tailMap
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.tailMap(java.lang.Integer):135:135 -> tailMap
     2:2:java.util.SortedMap tailMap(java.lang.Object):17 -> tailMap
-com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$1 -> com.android.tools.r8.internal.zS0:
-com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder -> com.android.tools.r8.internal.AS0:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$1 -> com.android.tools.r8.internal.CS0:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder -> com.android.tools.r8.internal.DS0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap sortedMap -> a
     1:3:void <init>():41:43 -> <init>
     1:1:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder put(int,java.lang.Object):46:46 -> a
     2:2:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap build():51:51 -> a
-com.android.tools.r8.utils.collections.LongLivedProgramMethodMultisetBuilder -> com.android.tools.r8.internal.b61:
+com.android.tools.r8.utils.collections.LongLivedProgramMethodMultisetBuilder -> com.android.tools.r8.internal.e61:
     com.android.tools.r8.com.google.common.collect.Multiset backing -> a
     1:1:void <init>():19:19 -> <init>
     2:2:void <init>():17:17 -> <init>
@@ -131842,28 +132095,47 @@ com.android.tools.r8.utils.collections.LongLivedProgramMethodMultisetBuilder ->
     7:7:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMultiset,com.android.tools.r8.graph.DexMethod,int):38 -> a
     8:9:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMultiset,com.android.tools.r8.graph.DexMethod,int):38:39 -> a
     1:1:int size():30:30 -> b
-com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder -> com.android.tools.r8.internal.c61:
-    java.util.Set methods -> b
+com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder -> com.android.tools.r8.internal.f61:
+    java.util.function.IntFunction factoryForBuilder -> b
+    java.util.Set methods -> d
+    boolean $assertionsDisabled -> e
     java.util.function.IntFunction factory -> a
-    1:3:void <init>(java.util.function.IntFunction,java.util.Set):22:24 -> <init>
-    1:2:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder createConcurrentForIdentitySet():38:39 -> a
-    3:3:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$createConcurrentForIdentitySet$1(int):39:39 -> a
-    4:4:void add(com.android.tools.r8.graph.ProgramMethod):43:43 -> a
-    5:5:void remove(com.android.tools.r8.graph.DexMethod):51:51 -> a
-    6:6:void removeAll(java.lang.Iterable):55:55 -> a
-    7:9:com.android.tools.r8.utils.collections.ProgramMethodSet build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):72:74 -> a
-    10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    10:10:com.android.tools.r8.utils.collections.ProgramMethodSet build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):75 -> a
-    11:12:com.android.tools.r8.utils.collections.ProgramMethodSet build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):75:76 -> a
-    1:2:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder createForIdentitySet():28:29 -> b
-    3:8:void rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):59:64 -> b
-    1:1:boolean isEmpty():82:82 -> c
-com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap -> com.android.tools.r8.internal.h91:
+    com.android.tools.r8.graph.GraphLens appliedGraphLens -> c
+    1:1:void <clinit>():17:17 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.GraphLens,java.util.function.IntFunction,java.util.function.IntFunction):34:38 -> <init>
+    boolean lambda$verifyIsRewrittenWithNewerLens$1(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens) -> a
+    1:1:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder createConcurrentForIdentitySet(com.android.tools.r8.graph.GraphLens):49:49 -> a
+    2:2:void add(com.android.tools.r8.graph.ProgramMethod):55:55 -> a
+    3:4:void add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):61:62 -> a
+    5:6:void addAll(java.lang.Iterable,com.android.tools.r8.graph.GraphLens):66:67 -> a
+    7:7:void clear():71:71 -> a
+    8:8:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder merge(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder):88:88 -> a
+    9:9:boolean com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.isRewrittenWithLens(com.android.tools.r8.graph.GraphLens):81:81 -> a
+    9:9:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder merge(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder):88 -> a
+    10:16:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder merge(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder):89:95 -> a
+    17:17:void remove(com.android.tools.r8.graph.DexMethod):102:102 -> a
+    18:18:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder removeAll(java.lang.Iterable):106:106 -> a
+    19:22:com.android.tools.r8.utils.collections.ProgramMethodSet build(com.android.tools.r8.graph.AppView):134:137 -> a
+    23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
+    23:23:com.android.tools.r8.utils.collections.ProgramMethodSet build(com.android.tools.r8.graph.AppView):138 -> a
+    24:25:com.android.tools.r8.utils.collections.ProgramMethodSet build(com.android.tools.r8.graph.AppView):138:139 -> a
+    1:1:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder createForIdentitySet(com.android.tools.r8.graph.GraphLens):43:43 -> b
+    2:2:void lambda$addAll$0(com.android.tools.r8.graph.ProgramMethod):67:67 -> b
+    3:4:boolean contains(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):76:77 -> b
+    5:5:boolean isEmpty():145:145 -> b
+    1:13:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder rewrittenWithLens(com.android.tools.r8.graph.GraphLens):117:129 -> c
+    1:1:boolean verifyIsRewrittenWithLens(com.android.tools.r8.graph.GraphLens):149:149 -> d
+    2:2:boolean com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.isRewrittenWithLens(com.android.tools.r8.graph.GraphLens):81:81 -> d
+    2:2:boolean verifyIsRewrittenWithLens(com.android.tools.r8.graph.GraphLens):149 -> d
+    3:3:boolean verifyIsRewrittenWithLens(com.android.tools.r8.graph.GraphLens):149:149 -> d
+    1:4:boolean verifyIsRewrittenWithNewerLens(com.android.tools.r8.graph.GraphLens):154:157 -> e
+    5:5:boolean verifyIsRewrittenWithNewerLens(com.android.tools.r8.graph.GraphLens):156:156 -> e
+com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap -> com.android.tools.r8.internal.k91:
     void put(java.lang.Iterable,java.lang.Object) -> a
-com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.i91:
-com.android.tools.r8.utils.collections.MutableBidirectionalOneToManyRepresentativeMap -> com.android.tools.r8.internal.j91:
-com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap -> com.android.tools.r8.internal.k91:
-com.android.tools.r8.utils.collections.ProgramFieldSet -> com.android.tools.r8.internal.sf1:
+com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.l91:
+com.android.tools.r8.utils.collections.MutableBidirectionalOneToManyRepresentativeMap -> com.android.tools.r8.internal.m91:
+com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap -> com.android.tools.r8.internal.n91:
+com.android.tools.r8.utils.collections.ProgramFieldSet -> com.android.tools.r8.internal.vf1:
     java.util.Map backing -> a
     com.android.tools.r8.utils.collections.ProgramFieldSet EMPTY -> b
     boolean $assertionsDisabled -> c
@@ -131877,7 +132149,7 @@ com.android.tools.r8.utils.collections.ProgramFieldSet -> com.android.tools.r8.i
     1:1:com.android.tools.r8.utils.collections.ProgramFieldSet empty():34:34 -> b
     2:2:boolean contains(com.android.tools.r8.graph.ProgramField):60:60 -> b
     1:1:java.util.Iterator iterator():73:73 -> iterator
-com.android.tools.r8.utils.collections.ProgramMemberMap -> com.android.tools.r8.internal.uf1:
+com.android.tools.r8.utils.collections.ProgramMemberMap -> com.android.tools.r8.internal.xf1:
     java.util.Map backing -> a
     1:2:void <init>(java.util.function.Supplier):19:20 -> <init>
     1:1:java.lang.Object computeIfAbsent(com.android.tools.r8.graph.ProgramMember,java.util.function.Function):28:28 -> a
@@ -131890,7 +132162,7 @@ com.android.tools.r8.utils.collections.ProgramMemberMap -> com.android.tools.r8.
     9:9:void removeIf(java.util.function.BiPredicate):53:53 -> a
     1:1:java.lang.Object remove(com.android.tools.r8.graph.ProgramMember):49:49 -> b
     com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.ProgramMember) -> c
-com.android.tools.r8.utils.collections.ProgramMethodMap -> com.android.tools.r8.internal.wf1:
+com.android.tools.r8.utils.collections.ProgramMethodMap -> com.android.tools.r8.internal.zf1:
     com.android.tools.r8.utils.collections.ProgramMethodMap EMPTY -> b
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):21:21 -> <init>
@@ -131900,7 +132172,7 @@ com.android.tools.r8.utils.collections.ProgramMethodMap -> com.android.tools.r8.
     2:2:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.utils.collections.ProgramMethodMap.wrap(com.android.tools.r8.graph.ProgramMethod):39:39 -> c
     2:2:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.ProgramMember):16 -> c
     3:3:com.android.tools.r8.utils.collections.ProgramMethodMap empty():34:34 -> c
-com.android.tools.r8.utils.collections.ProgramMethodMultiset -> com.android.tools.r8.internal.xf1:
+com.android.tools.r8.utils.collections.ProgramMethodMultiset -> com.android.tools.r8.internal.Af1:
     com.android.tools.r8.com.google.common.collect.Multiset backing -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multiset):20:21 -> <init>
     1:1:com.android.tools.r8.utils.collections.ProgramMethodMultiset createHash():25:25 -> a
@@ -131910,7 +132182,7 @@ com.android.tools.r8.utils.collections.ProgramMethodMultiset -> com.android.tool
     4:4:void createAndAdd(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,int):29:29 -> a
     5:5:void forEachEntry(java.util.function.ObjIntConsumer):33:33 -> a
     6:6:void lambda$forEachEntry$0(java.util.function.ObjIntConsumer,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,int):33:33 -> a
-com.android.tools.r8.utils.collections.ProgramMethodSet -> com.android.tools.r8.internal.yf1:
+com.android.tools.r8.utils.collections.ProgramMethodSet -> com.android.tools.r8.internal.Bf1:
     com.android.tools.r8.utils.collections.ProgramMethodSet EMPTY -> d
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):25:25 -> <init>
@@ -131927,7 +132199,7 @@ com.android.tools.r8.utils.collections.ProgramMethodSet -> com.android.tools.r8.
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet createLinked():59:59 -> d
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet empty():63:63 -> e
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet create(int):39:39 -> g
-com.android.tools.r8.utils.collections.SortedProgramMethodSet -> com.android.tools.r8.internal.Cn1:
+com.android.tools.r8.utils.collections.SortedProgramMethodSet -> com.android.tools.r8.internal.un1:
     com.android.tools.r8.utils.collections.SortedProgramMethodSet EMPTY -> e
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):29:29 -> <init>
@@ -131945,7 +132217,7 @@ com.android.tools.r8.utils.collections.SortedProgramMethodSet -> com.android.too
     1:1:java.util.SortedMap lambda$create$1():44:44 -> i
     1:1:java.util.SortedMap lambda$createConcurrent$2():50:50 -> j
     1:1:java.util.SortedMap lambda$static$0():26:26 -> k
-com.android.tools.r8.utils.structural.CompareToVisitor -> com.android.tools.r8.internal.II0:
+com.android.tools.r8.utils.structural.CompareToVisitor -> com.android.tools.r8.internal.LI0:
     1:1:void <init>():18:18 -> <init>
     int visit(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping) -> a
     int visitBool(boolean,boolean) -> a
@@ -131960,7 +132232,7 @@ com.android.tools.r8.utils.structural.CompareToVisitor -> com.android.tools.r8.i
     1:1:int visitItemCollection(java.util.Collection,java.util.Collection):40:40 -> a
     2:2:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):48:48 -> a
     3:3:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):52:52 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorBase -> com.android.tools.r8.internal.LI0:
+com.android.tools.r8.utils.structural.CompareToVisitorBase -> com.android.tools.r8.internal.OI0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>():19:19 -> <init>
@@ -131981,8 +132253,8 @@ com.android.tools.r8.utils.structural.CompareToVisitorBase -> com.android.tools.
     16:16:int visitDexReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):79 -> a
     17:21:int visitDexReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):80:84 -> a
     22:24:int visit(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):97:99 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorBase$1 -> com.android.tools.r8.internal.JI0:
-com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification -> com.android.tools.r8.internal.KI0:
+com.android.tools.r8.utils.structural.CompareToVisitorBase$1 -> com.android.tools.r8.internal.MI0:
+com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification -> com.android.tools.r8.internal.NI0:
     com.android.tools.r8.utils.structural.CompareToVisitorBase parent -> a
     java.lang.Object item1 -> b
     boolean $assertionsDisabled -> e
@@ -132052,7 +132324,7 @@ com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification ->
     12:12:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):102 -> i
     13:13:com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification.withShortArray(java.util.function.Function):186:186 -> i
     13:13:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):102 -> i
-com.android.tools.r8.utils.structural.CompareToVisitorWithNamingLens -> com.android.tools.r8.internal.MI0:
+com.android.tools.r8.utils.structural.CompareToVisitorWithNamingLens -> com.android.tools.r8.internal.PI0:
     com.android.tools.r8.naming.NamingLens namingLens -> b
     1:2:void <init>(com.android.tools.r8.naming.NamingLens):26:27 -> <init>
     1:4:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):32:35 -> a
@@ -132074,40 +132346,40 @@ com.android.tools.r8.utils.structural.CompareToVisitorWithNamingLens -> com.andr
     15:15:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):65:65 -> a
     15:15:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):57 -> a
     16:16:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):61:61 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorWithStringTable -> com.android.tools.r8.internal.NI0:
+com.android.tools.r8.utils.structural.CompareToVisitorWithStringTable -> com.android.tools.r8.internal.QI0:
     java.util.function.ToIntFunction stringTable -> c
     1:2:void <init>(com.android.tools.r8.naming.NamingLens,java.util.function.ToIntFunction):16:17 -> <init>
     1:1:int visitDexString(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):22:22 -> a
     2:2:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):38:38 -> a
     2:2:int visitDexString(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):22 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorWithTypeEquivalence -> com.android.tools.r8.internal.OI0:
+com.android.tools.r8.utils.structural.CompareToVisitorWithTypeEquivalence -> com.android.tools.r8.internal.RI0:
     com.android.tools.r8.utils.structural.RepresentativeMap representatives -> b
     1:2:void <init>(com.android.tools.r8.utils.structural.RepresentativeMap):23:24 -> <init>
     1:3:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):29:31 -> a
     4:4:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):65:65 -> a
     4:4:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):31 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorWithTypeTable -> com.android.tools.r8.internal.PI0:
+com.android.tools.r8.utils.structural.CompareToVisitorWithTypeTable -> com.android.tools.r8.internal.SI0:
     java.util.function.ToIntFunction typeTable -> d
     1:2:void <init>(com.android.tools.r8.naming.NamingLens,java.util.function.ToIntFunction,java.util.function.ToIntFunction):19:20 -> <init>
     1:1:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):25:25 -> a
     2:2:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):38:38 -> a
     2:2:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):25 -> a
-com.android.tools.r8.utils.structural.DefaultCompareToVisitor -> com.android.tools.r8.internal.nK0:
+com.android.tools.r8.utils.structural.DefaultCompareToVisitor -> com.android.tools.r8.internal.qK0:
     com.android.tools.r8.graph.DexType lambda$run$1(com.android.tools.r8.graph.DexType) -> a
     1:1:int run(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):21:21 -> a
     2:3:int com.android.tools.r8.utils.structural.CompareToVisitorWithTypeEquivalence.run(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.RepresentativeMap,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):17:18 -> a
     2:3:int run(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):21 -> a
-com.android.tools.r8.utils.structural.DefaultHashingVisitor -> com.android.tools.r8.internal.qK0:
+com.android.tools.r8.utils.structural.DefaultHashingVisitor -> com.android.tools.r8.internal.tK0:
     com.android.tools.r8.graph.DexType lambda$run$1(com.android.tools.r8.graph.DexType) -> a
     1:1:void run(java.lang.Object,com.android.tools.r8.com.google.common.hash.Hasher,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):22:22 -> a
-com.android.tools.r8.utils.structural.Equatable -> com.android.tools.r8.internal.hO0:
+com.android.tools.r8.utils.structural.Equatable -> com.android.tools.r8.internal.kO0:
     1:1:void <clinit>():6:6 -> <clinit>
     boolean isEqualTo(java.lang.Object) -> a
     1:8:boolean equalsImpl(com.android.tools.r8.utils.structural.Equatable,java.lang.Object):47:54 -> a
-com.android.tools.r8.utils.structural.Equatable$1 -> com.android.tools.r8.internal.gO0:
+com.android.tools.r8.utils.structural.Equatable$1 -> com.android.tools.r8.internal.jO0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():47:47 -> <clinit>
-com.android.tools.r8.utils.structural.HashCodeVisitor -> com.android.tools.r8.internal.pR0:
+com.android.tools.r8.utils.structural.HashCodeVisitor -> com.android.tools.r8.internal.sR0:
     int $r8$clinit -> d
     java.lang.Object item -> a
     int hashCode -> b
@@ -132136,7 +132408,7 @@ com.android.tools.r8.utils.structural.HashCodeVisitor -> com.android.tools.r8.in
     3:5:com.android.tools.r8.utils.structural.StructuralSpecification withCustomItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):25 -> b
     1:1:com.android.tools.r8.utils.structural.HashCodeVisitor com.android.tools.r8.utils.structural.HashCodeVisitor.withShortArray(java.util.function.Function):89:89 -> i
     1:1:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):25 -> i
-com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence -> com.android.tools.r8.internal.zR0:
+com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence -> com.android.tools.r8.internal.CR0:
     com.android.tools.r8.com.google.common.hash.Hasher hash -> a
     com.android.tools.r8.utils.structural.RepresentativeMap representatives -> b
     1:1:void com.android.tools.r8.utils.structural.HashingVisitor.<init>():18:18 -> <init>
@@ -132168,8 +132440,8 @@ com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence -> com.a
     15:15:void visitDexType(com.android.tools.r8.graph.DexType):73 -> a
     16:16:void visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):78:78 -> a
     1:1:void com.android.tools.r8.utils.structural.HashingVisitor.visitDexReference(com.android.tools.r8.graph.DexReference):54:54 -> b
-com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$1 -> com.android.tools.r8.internal.xR0:
-com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification -> com.android.tools.r8.internal.yR0:
+com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$1 -> com.android.tools.r8.internal.AR0:
+com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification -> com.android.tools.r8.internal.BR0:
     java.lang.Object item -> b
     com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence parent -> a
     boolean $assertionsDisabled -> c
@@ -132198,7 +132470,7 @@ com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpec
     6:7:com.android.tools.r8.utils.structural.StructuralSpecification withCustomItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):93 -> b
     1:3:com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification.withShortArray(java.util.function.Function):150:152 -> i
     1:3:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):93 -> i
-com.android.tools.r8.utils.structural.Ordered -> com.android.tools.r8.internal.Fd1:
+com.android.tools.r8.utils.structural.Ordered -> com.android.tools.r8.internal.Id1:
     1:1:void <clinit>():7:7 -> <clinit>
     1:2:boolean isEqualTo(java.lang.Object):16:17 -> a
     3:3:com.android.tools.r8.utils.structural.Ordered com.android.tools.r8.utils.structural.Ordered.min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> a
@@ -132210,13 +132482,13 @@ com.android.tools.r8.utils.structural.Ordered -> com.android.tools.r8.internal.F
     1:1:com.android.tools.r8.utils.structural.Ordered min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> d
     2:2:boolean isGreaterThanOrEqualTo(java.lang.Object):61:61 -> d
     1:1:boolean isLessThanOrEqualTo(java.lang.Object):53:53 -> e
-com.android.tools.r8.utils.structural.Ordered$1 -> com.android.tools.r8.internal.Ed1:
+com.android.tools.r8.utils.structural.Ordered$1 -> com.android.tools.r8.internal.Hd1:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
-com.android.tools.r8.utils.structural.RepresentativeMap -> com.android.tools.r8.internal.ll1:
+com.android.tools.r8.utils.structural.RepresentativeMap -> com.android.tools.r8.internal.jl1:
     com.android.tools.r8.graph.DexType getRepresentative(com.android.tools.r8.graph.DexType) -> a
-com.android.tools.r8.utils.structural.StructuralAcceptor -> com.android.tools.r8.internal.wp1:
-com.android.tools.r8.utils.structural.StructuralItem -> com.android.tools.r8.internal.zp1:
+com.android.tools.r8.utils.structural.StructuralAcceptor -> com.android.tools.r8.internal.op1:
+com.android.tools.r8.utils.structural.StructuralItem -> com.android.tools.r8.internal.rp1:
     1:1:int compareTo(com.android.tools.r8.utils.structural.StructuralItem):31:31 -> a
     2:2:int compareWithTypeEquivalenceTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.RepresentativeMap):42:42 -> a
     3:4:int com.android.tools.r8.utils.structural.CompareToVisitorWithTypeEquivalence.run(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.RepresentativeMap,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):17:18 -> a
@@ -132229,13 +132501,13 @@ com.android.tools.r8.utils.structural.StructuralItem -> com.android.tools.r8.int
     com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping() -> l
     com.android.tools.r8.utils.structural.StructuralItem self() -> q
     1:3:java.lang.String hashForTesting():69:71 -> r
-com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept -> com.android.tools.r8.internal.xp1:
+com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept -> com.android.tools.r8.internal.pp1:
     int acceptCompareTo(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.CompareToVisitor) -> a
-com.android.tools.r8.utils.structural.StructuralItem$HashingAccept -> com.android.tools.r8.internal.yp1:
+com.android.tools.r8.utils.structural.StructuralItem$HashingAccept -> com.android.tools.r8.internal.qp1:
     void acceptHashing(java.lang.Object,com.android.tools.r8.utils.structural.HashingVisitor) -> a
-com.android.tools.r8.utils.structural.StructuralMapping -> com.android.tools.r8.internal.Ap1:
+com.android.tools.r8.utils.structural.StructuralMapping -> com.android.tools.r8.internal.sp1:
     void apply(com.android.tools.r8.utils.structural.StructuralSpecification) -> a
-com.android.tools.r8.utils.structural.StructuralSpecification -> com.android.tools.r8.internal.Bp1:
+com.android.tools.r8.utils.structural.StructuralSpecification -> com.android.tools.r8.internal.tp1:
     1:1:void <init>():18:18 -> <init>
     boolean lambda$withCustomItem$0(java.lang.Object) -> a
     com.android.tools.r8.utils.structural.StructuralSpecification self() -> a
-- 
cgit v1.2.3